From 9e853b270729893ae55b44a5b648a2b9d09234bb Mon Sep 17 00:00:00 2001 From: Jan Klare Date: Mon, 10 Nov 2014 17:44:39 +0100 Subject: [PATCH] Updated berkshelf to 3.1.5, chefspec to 4.0.0 and foodcritic to 4.0 * Updated berkshelf from 2.0.18 to 3.1.5 in Gemfile * added supermarket source to Berksfile * some refactoring of the Berksfile * removed Gemfile.lock since its not supposed to be in master branches * also updated chefspec to 4 and foodcritic to 4 (like done some time ago for the other cookbooks) Change-Id: I787912448337040ccf26a1126d848c76e7148caf Implements: blueprint update-berkshelf --- .gitignore | 1 + Berksfile | 14 ++-- Gemfile | 8 +- Gemfile.lock | 230 --------------------------------------------------- TESTING.md | 2 +- 5 files changed, 14 insertions(+), 241 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index 6588c1f..6fd9550 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ .coverage/ *.swp Berksfile.lock +Gemfile.lock Vagrantfile diff --git a/Berksfile b/Berksfile index 89669fb..9369731 100644 --- a/Berksfile +++ b/Berksfile @@ -1,14 +1,16 @@ +source 'https://supermarket.getchef.com' + metadata cookbook "openstack-common", - git: "git://github.com/stackforge/cookbook-openstack-common.git" + github: "stackforge/cookbook-openstack-common" cookbook "openstack-identity", - git: "git://github.com/stackforge/cookbook-openstack-identity.git" + github: "stackforge/cookbook-openstack-identity" cookbook "openstack-image", - git: "git://github.com/stackforge/cookbook-openstack-image.git" + github: "stackforge/cookbook-openstack-image" cookbook "openstack-compute", - git: "git://github.com/stackforge/cookbook-openstack-compute.git" + github: "stackforge/cookbook-openstack-compute" cookbook "openstack-network", - git: "git://github.com/stackforge/cookbook-openstack-network.git" + github: "stackforge/cookbook-openstack-network" cookbook "openstack-block-storage", - git: "git://github.com/stackforge/cookbook-openstack-block-storage.git" + github: "stackforge/cookbook-openstack-block-storage" diff --git a/Gemfile b/Gemfile index ccfa456..a7e240a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,9 @@ source 'https://rubygems.org' -gem 'chef', '~> 11.8' +gem 'chef', '~> 11.16' gem 'json', '<= 1.7.7' # chef 11 dependency -gem 'berkshelf', '~> 2.0.10' -gem 'chefspec', '~> 3.4.0' -gem 'foodcritic', '~> 3.0.3' gem 'strainer' +gem 'berkshelf', '~> 3.1.5' +gem 'chefspec', '~> 4.0.0' +gem 'foodcritic', '~> 4.0' gem 'rubocop', '~> 0.18.1' diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 6986489..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,230 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - activesupport (3.2.18) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) - addressable (2.3.6) - akami (1.2.2) - gyoku (>= 0.4.0) - nokogiri - ast (2.0.0) - berkshelf (2.0.16) - activesupport (~> 3.2.0) - addressable (~> 2.3.4) - buff-shell_out (~> 0.1) - chozo (>= 0.6.1) - faraday (~> 0.8.0) - faraday (~> 0.8.5) - hashie (>= 2.0.2) - minitar (~> 0.5.4) - rbzip2 (~> 0.2.0) - retryable (~> 1.3.3) - ridley (~> 1.7.0) - solve (~> 0.8.2) - thor (~> 0.18.0) - buff-config (0.4.0) - buff-extensions (~> 0.3) - varia_model (~> 0.1) - buff-extensions (0.5.0) - buff-ignore (1.1.1) - buff-platform (0.1.0) - buff-ruby_engine (0.1.0) - buff-shell_out (0.1.1) - buff-ruby_engine (~> 0.1.0) - builder (3.2.2) - celluloid (0.15.2) - timers (~> 1.1.0) - celluloid-io (0.15.0) - celluloid (>= 0.15.0) - nio4r (>= 0.5.0) - chef (11.12.4) - chef-zero (~> 2.0, >= 2.0.2) - diff-lcs (~> 1.2, >= 1.2.4) - erubis (~> 2.7) - highline (~> 1.6, >= 1.6.9) - json (>= 1.4.4, <= 1.8.1) - mime-types (~> 1.16) - mixlib-authentication (~> 1.3) - mixlib-cli (~> 1.4) - mixlib-config (~> 2.0) - mixlib-log (~> 1.3) - mixlib-shellout (~> 1.4) - net-ssh (~> 2.6) - net-ssh-multi (~> 1.1) - ohai (~> 7.0.4) - pry (~> 0.9) - rest-client (>= 1.0.4, < 1.7.0) - yajl-ruby (~> 1.1) - chef-zero (2.0.2) - hashie (~> 2.0) - json - mixlib-log (~> 1.3) - rack - chefspec (3.4.0) - chef (~> 11.0) - fauxhai (~> 2.0) - rspec (~> 2.14) - chozo (0.6.1) - activesupport (>= 3.2.0) - hashie (>= 2.0.2) - multi_json (>= 1.3.0) - coderay (1.1.0) - diff-lcs (1.2.5) - erubis (2.7.0) - faraday (0.8.9) - multipart-post (~> 1.2.0) - fauxhai (2.1.2) - net-ssh - ohai - ffi (1.9.3) - foodcritic (3.0.3) - erubis - gherkin (~> 2.11.7) - nokogiri (~> 1.5.4) - rake - treetop (~> 1.4.10) - yajl-ruby (~> 1.1.0) - gherkin (2.11.8) - multi_json (~> 1.3) - gssapi (1.0.3) - ffi (>= 1.0.1) - gyoku (1.1.1) - builder (>= 2.1.2) - hashie (2.1.1) - highline (1.6.21) - httpclient (2.3.4.1) - httpi (0.9.7) - rack - i18n (0.6.9) - ipaddress (0.8.0) - json (1.7.7) - little-plugger (1.1.3) - logging (1.8.2) - little-plugger (>= 1.1.3) - multi_json (>= 1.8.4) - method_source (0.8.2) - mime-types (1.25.1) - minitar (0.5.4) - mixlib-authentication (1.3.0) - mixlib-log - mixlib-cli (1.5.0) - mixlib-config (2.1.0) - mixlib-log (1.6.0) - mixlib-shellout (1.4.0) - multi_json (1.10.1) - multipart-post (1.2.0) - net-http-persistent (2.9.4) - net-ssh (2.9.1) - net-ssh-gateway (1.2.0) - net-ssh (>= 2.6.5) - net-ssh-multi (1.2.0) - net-ssh (>= 2.6.5) - net-ssh-gateway (>= 1.2.0) - nio4r (1.0.0) - nokogiri (1.5.11) - nori (1.1.5) - ohai (7.0.4) - ipaddress - mime-types (~> 1.16) - mixlib-cli - mixlib-config (~> 2.0) - mixlib-log - mixlib-shellout (~> 1.2) - systemu (~> 2.5.2) - yajl-ruby - parser (2.1.9) - ast (>= 1.1, < 3.0) - slop (~> 3.4, >= 3.4.5) - polyglot (0.3.4) - powerpack (0.0.9) - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) - slop (~> 3.4) - rack (1.5.2) - rainbow (2.0.0) - rake (10.3.2) - rbzip2 (0.2.0) - rest-client (1.6.7) - mime-types (>= 1.16) - retryable (1.3.5) - ridley (1.7.1) - addressable - buff-config (~> 0.2) - buff-extensions (~> 0.3) - buff-ignore (~> 1.1) - buff-shell_out (~> 0.1) - celluloid (~> 0.15) - celluloid-io (~> 0.15) - erubis - faraday (>= 0.8.4) - hashie (>= 2.0.2) - json (>= 1.7.7) - mixlib-authentication (>= 1.3.0) - net-http-persistent (>= 2.8) - net-ssh - retryable - solve (>= 0.4.4) - varia_model (~> 0.1) - winrm (~> 1.1.0) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.8) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rubocop (0.18.1) - json (>= 1.7.7, < 2) - parser (~> 2.1.3) - powerpack (~> 0.0.6) - rainbow (>= 1.99.1, < 3.0) - rubyntlm (0.1.1) - savon (0.9.5) - akami (~> 1.0) - builder (>= 2.1.2) - gyoku (>= 0.4.0) - httpi (~> 0.9) - nokogiri (>= 1.4.0) - nori (~> 1.0) - wasabi (~> 1.0) - slop (3.5.0) - solve (0.8.2) - strainer (3.4.0) - berkshelf (>= 2.0, < 4.0) - buff-platform (~> 0.1) - systemu (2.5.2) - thor (0.18.1) - timers (1.1.0) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - uuidtools (2.1.4) - varia_model (0.3.2) - buff-extensions (~> 0.2) - hashie (>= 2.0.2) - wasabi (1.0.0) - nokogiri (>= 1.4.0) - winrm (1.1.3) - gssapi (~> 1.0.0) - httpclient (~> 2.2, >= 2.2.0.2) - logging (~> 1.6, >= 1.6.1) - nokogiri (~> 1.5) - rubyntlm (~> 0.1.1) - savon (= 0.9.5) - uuidtools (~> 2.1.2) - yajl-ruby (1.1.0) - -PLATFORMS - ruby - -DEPENDENCIES - berkshelf (~> 2.0.10) - chef (~> 11.8) - chefspec (~> 3.4.0) - foodcritic (~> 3.0.3) - json (<= 1.7.7) - rubocop (~> 0.18.1) - strainer diff --git a/TESTING.md b/TESTING.md index 2b52f68..1ed6680 100644 --- a/TESTING.md +++ b/TESTING.md @@ -11,7 +11,7 @@ To run all of the tests with Strainer: Or you may run the tests individually: $ bundle install --path=.bundle # install gem dependencies - $ bundle exec berks install --path=.cookbooks # install cookbook dependencies + $ bundle exec berks vendor .cookbooks # install cookbook dependencies and create the folder .cookbooks $ bundle exec strainer test -s Strainerfile # run tests ## Rubocop ##