Skip to content

Commit

Permalink
Merge pull request #16 from unifio/ci-updates
Browse files Browse the repository at this point in the history
Ci updates
  • Loading branch information
blakeneyops committed May 27, 2016
2 parents 611b07b + 24af8a5 commit b784706
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 32 deletions.
46 changes: 23 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
PATH
remote: .
specs:
prometheus-unifio (0.1.0)
aws-sdk (~> 2.2.19)
prometheus-unifio (0.1.3)
aws-sdk (~> 2.3.8)
deep_merge (~> 1.0.1)
dotenv (~> 2.1.0)
hiera (~> 3.0.6)
hiera (~> 3.2.0)
json (~> 1.8.3)
rake (>= 10.0)
rake (>= 11.1.2)
rest-client (~> 1.8.0)

GEM
remote: http://rubygems.org/
specs:
addressable (2.4.0)
aws-sdk (2.2.37)
aws-sdk-resources (= 2.2.37)
aws-sdk-core (2.2.37)
aws-sdk (2.3.9)
aws-sdk-resources (= 2.3.9)
aws-sdk-core (2.3.9)
jmespath (~> 1.0)
aws-sdk-resources (2.2.37)
aws-sdk-core (= 2.2.37)
aws-sdk-resources (2.3.9)
aws-sdk-core (= 2.3.9)
builder (3.2.2)
byebug (8.2.5)
byebug (9.0.4)
ci_reporter (2.0.0)
builder (>= 2.1.2)
ci_reporter_rspec (1.0.0)
Expand All @@ -36,7 +36,7 @@ GEM
unf (>= 0.0.5, < 1.0.0)
dotenv (2.1.1)
hashdiff (0.3.0)
hiera (3.0.6)
hiera (3.2.0)
json_pure
http-cookie (1.0.2)
domain_name (~> 0.5)
Expand All @@ -45,8 +45,8 @@ GEM
json (1.8.3)
json_pure (1.8.3)
method_source (0.8.2)
mime-types (2.99.1)
multi_json (1.12.0)
mime-types (2.99.2)
multi_json (1.12.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.1.1)
Expand All @@ -56,8 +56,8 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.3.0)
byebug (~> 8.0)
pry-byebug (3.4.0)
byebug (~> 9.0)
pry (~> 0.10)
rake (11.1.2)
rest-client (1.8.0)
Expand All @@ -81,22 +81,22 @@ GEM
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
safe_yaml (1.0.4)
serverspec (2.29.2)
serverspec (2.36.0)
multi_json
rspec (~> 3.0)
rspec-its
specinfra (~> 2.48)
specinfra (~> 2.53)
sfl (2.2)
slop (3.6.0)
specinfra (2.57.2)
specinfra (2.57.5)
net-scp
net-ssh (>= 2.7, < 4.0)
net-telnet
sfl
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
webmock (1.22.6)
webmock (2.0.3)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
Expand All @@ -105,13 +105,13 @@ PLATFORMS
ruby

DEPENDENCIES
bundler (>= 1.9.5)
bundler (>= 1.9.0)
ci_reporter_rspec (~> 1.0.0)
prometheus-unifio!
pry-byebug (~> 3.3.0)
pry-byebug (~> 3.4.0)
rspec (~> 3.4.0)
serverspec (~> 2.29.2)
webmock (~> 1.22.6)
serverspec (~> 2.36.0)
webmock (~> 2.0.3)

BUNDLED WITH
1.11.2
6 changes: 6 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ machine:
services:
- docker
environment:
PROMETHEUS_VERSION: 0.1.3
ATLAS_TOKEN: GryCCpG3GRBqQw.atlasv1.1ASD0jMKyVmLmUVlqP7ca6xdxqzY1nNroAVtTSKRBYR7fnLxciPCboidfwKR6bXBaWQ
TERRAFORM_IMG: unifio/terraform:latest
TERRAFORM_CMD: "docker run -e ATLAS_TOKEN=$ATLAS_TOKEN --rm"
Expand All @@ -11,3 +12,8 @@ test:
- docker pull unifio/terraform:latest
override:
- bundle exec rake ci:prometheus
- gem build prometheus.gemspec

general:
artifacts:
- prometheus-unifio-0.1.3.gem
14 changes: 7 additions & 7 deletions prometheus.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ Gem::Specification.new do |spec|

spec.add_dependency "deep_merge", "~> 1.0.1"
spec.add_dependency "dotenv", "~> 2.1.0"
spec.add_dependency "hiera", "~> 3.0.6"
spec.add_dependency "hiera", "~> 3.2.0"
spec.add_dependency "json", "~> 1.8.3"
spec.add_dependency "rest-client", "~> 1.8.0"
spec.add_dependency "rake", ">= 10.0"
spec.add_dependency "aws-sdk", "~> 2.2.19"
spec.add_dependency "rake", ">= 11.1.2"
spec.add_dependency "aws-sdk", "~> 2.3.8"

spec.add_development_dependency "bundler", ">= 1.9.5"
spec.add_development_dependency "bundler", ">= 1.9.0"
spec.add_development_dependency "ci_reporter_rspec", "~> 1.0.0"
spec.add_development_dependency "pry-byebug", "~> 3.3.0"
spec.add_development_dependency "pry-byebug", "~> 3.4.0"
spec.add_development_dependency "rspec", "~> 3.4.0"
spec.add_development_dependency "serverspec", "~> 2.29.2"
spec.add_development_dependency "webmock", "~> 1.22.6"
spec.add_development_dependency "serverspec", "~> 2.36.0"
spec.add_development_dependency "webmock", "~> 2.0.3"
end
2 changes: 1 addition & 1 deletion ruby/lib/prometheus-unifio/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Prometheus
VERSION = "0.1.0"
VERSION = "0.1.3"
end
2 changes: 1 addition & 1 deletion ruby/lib/rake/rspec.rake
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ namespace :ci do
task :envs => ['ci:setup:rspec', 'spec:envs']

desc 'Check syntax of all .yaml files'
task :check_yaml => ['ci:setup:rspec', 'spec:yaml']
task :check_yaml => ['ci:setup:rspec', 'spec:check_yaml']

end

0 comments on commit b784706

Please sign in to comment.