berkshelf 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d617756f57bd00473621c9bf8f95912ff28b264e
-  data.tar.gz: a2f9697345df907bc82be9953a1f16ffa7cd3bef
+  metadata.gz: cb46a7f69b8ffe285a82a5d5c2f3c50a8c0675fe
+  data.tar.gz: cdffca6593306424fcc6b610ec9461432aecfd30
 SHA512:
-  metadata.gz: 7aebefd6e55c3560d177d3416c04feb0aaeb81612508461d9c46c796deb535bf8ddc0f3aec35762dc1a5c1752987a79c4e69fb76d4dd86dc9bae9263741e0c8d
-  data.tar.gz: 9a5e5bdd6350206ca16bbba643fc328399ae1104a2b476edbc4fadfda2176cd5ff3a366e8b443a28dcd22b9d632ba7f208da08435c7f0b72b1c1d2ed3e61e7a0
+  metadata.gz: 861440210543c39944ddb44aaab1aa47ca3fa3cdf4de430d66b5e15945ecc08aef4a151b08a444bf1ed94752f6383b4cf8e7775b1110d2d18bef327a78f1c540
+  data.tar.gz: 96d9786d0c9c023954200ee7a3cc4b13febb96bf261f270bde5e4801e90af1befcd853cedc3d2e58543f45c982b13cb3610dff0a7bda8593e1a46f6a8cded031

data/.travis.yml

@@ -27,11 +27,10 @@ notifications:
 branches:
   only:
     - master
-#bundler_args: --without guard changelog --jobs 7
 before_install:
   - gem update --system
   - gem install bundler
-install:  travis_wait bundle install --without guard changelog --jobs 7 --retry=3
+install:  travis_wait bundle install --without changelog --jobs 7 --retry=3
 before_script:
   - echo "StrictHostKeyChecking no" > ~/.ssh/config
   - git config --global user.email "ci@berkshelf.com"
@@ -43,7 +42,13 @@ matrix:
     - rvm: ruby-head
     - rvm: 2.4.1
       before_install:
-        rm Gemfile.lock
+        - gem update --system
+        - gem install bundler
+        - rm Gemfile.lock
+    - rvm: 2.3.3
+      env:
+        CHEFSTYLE: 1
+      script: bundle exec rake style
     - rvm: 2.4.1
       before_install:
         # Failures in the berkshelf-api gemspec were happening with bundler 1.8

data/Gemfile

@@ -6,33 +6,6 @@ group :changelog do
   gem "github_changelog_generator"
 end
 
-group :guard do
-  gem "coolline"
-  gem "guard"
-  gem "guard-cucumber"
-  gem "guard-rspec"
-
-  require "rbconfig"
-
-  install_if -> { RbConfig::CONFIG["target_os"] =~ /darwin/i } do
-    gem "growl", require: false
-    gem "rb-fsevent", require: false
-
-    install_if -> { `uname`.strip == "Darwin" && `sw_vers -productVersion`.strip >= "10.8" } do
-      gem "terminal-notifier-guard", "~> 1.5.3", require: false
-    end rescue Errno::ENOENT
-  end
-  install_if -> {RbConfig::CONFIG["target_os"] =~ /linux/i } do
-    gem "libnotify",  "~> 0.8.0", require: false
-    gem "rb-inotify", require: false
-  end
-  install_if -> { RbConfig::CONFIG["target_os"] =~ /mswin|mingw/i } do
-    gem "rb-notifu", ">= 0.0.4", require: false
-    gem "wdm", require: false
-    gem "win32console", require: false
-  end
-end
-
 group :build do
   gem "rake",          ">= 10.1"
 end
@@ -46,11 +19,11 @@ group :development do
   gem "fuubar",        ">= 2.0"
   gem "rspec",         ">= 3.0"
   gem "rspec-its",     ">= 1.2"
-  gem "test-kitchen",  ">= 1.2"
   gem "webmock",       ">= 1.11"
   gem "yard",          ">= 0.8"
   gem "http",          ">= 0.9.8"
   gem "activesupport", "~> 4.0" # pinning for ruby 2.1.x
+  gem "chefstyle"
 end
 
 group :test do

data/Gemfile.lock

@@ -20,17 +20,18 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (6.0.1)
+    berkshelf (6.1.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
-      buff-shell_out (~> 1.0)
       cleanroom (~> 1.0)
+      concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
       mixlib-archive (~> 0.4)
+      mixlib-shellout (~> 2.0)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 5.0)
@@ -49,7 +50,6 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     archive (0.0.6)
       ffi (~> 1.9.3)
-    artifactory (2.8.1)
     aruba (0.14.2)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
@@ -57,6 +57,7 @@ GEM
       ffi (~> 1.9.10)
       rspec-expectations (>= 2.99)
       thor (~> 0.19)
+    ast (2.3.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -79,7 +80,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (13.0.118)
+    chef-config (13.1.31)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -90,15 +91,15 @@ GEM
       mixlib-log (~> 1.3)
       rack (~> 2.0)
       uuidtools (~> 2.1)
+    chefstyle (0.5.0)
+      rubocop (= 0.47.1)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     cleanroom (1.0.0)
-    coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.0.5)
     contracts (0.16.0)
-    coolline (0.5.0)
-      unicode_utils (~> 1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     cucumber (2.4.0)
@@ -123,14 +124,13 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.11)
     erubis (2.7.0)
-    faraday (0.9.2)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
     ffi (1.9.18)
     ffi-yajl (2.3.0)
       libyajl2 (~> 1.2)
-    formatador (0.2.5)
     fuubar (2.2.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -157,28 +157,9 @@ GEM
     grape-msgpack (0.2.0)
       grape (>= 0.16.1)
       msgpack (>= 0.7.4)
-    growl (1.0.3)
-    guard (2.14.1)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-cucumber (2.1.2)
-      cucumber (~> 2.0)
-      guard-compat (~> 1.0)
-      nenv (~> 0.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.4)
     hashie (3.5.5)
-    hitimes (1.2.4)
+    hitimes (1.2.5)
     http (2.2.2)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -186,21 +167,13 @@ GEM
       http_parser.rb (~> 0.6.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (1.0.2)
+    http-form_data (1.0.3)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (0.8.1)
+    i18n (0.8.4)
     ice_nine (0.11.2)
     json (2.1.0)
-    libnotify (0.8.4)
-      ffi (>= 1.0.11)
     libyajl2 (1.2.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
-    method_source (0.8.2)
     minitar (0.6.1)
     minitest (5.10.2)
     mixlib-archive (0.4.1)
@@ -208,14 +181,8 @@ GEM
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-config (2.2.4)
-    mixlib-install (2.1.12)
-      artifactory
-      mixlib-shellout
-      mixlib-versioning
-      thor
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
-    mixlib-versioning (1.1.0)
     molinillo (0.5.7)
     msgpack (1.1.0)
     multi_json (1.12.1)
@@ -225,22 +192,12 @@ GEM
     mustermann (1.0.0)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
-    nenv (0.3.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
-    net-ssh-gateway (1.3.0)
-      net-ssh (>= 2.6.5)
-    nio4r (2.0.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
+    nio4r (2.1.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
     public_suffix (2.0.5)
     rack (2.0.3)
     rack-accept (0.4.5)
@@ -248,10 +205,6 @@ GEM
     rainbow (2.2.2)
       rake
     rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rb-notifu (0.0.4)
     reel (0.6.1)
       celluloid (>= 0.15.1)
       celluloid-io (>= 0.15.0)
@@ -260,7 +213,7 @@ GEM
       websocket-driver (>= 0.5.1)
     retriable (2.1.0)
     retryable (2.0.4)
-    ridley (5.1.0)
+    ridley (5.1.1)
       addressable
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
@@ -270,7 +223,7 @@ GEM
       celluloid-io (~> 0.16.1)
       chef-config (>= 12.5.0)
       erubis
-      faraday (~> 0.9.0)
+      faraday (~> 0.9)
       hashie (>= 2.0.2, < 4.0.0)
       httpclient (~> 2.7)
       json (>= 1.7.7)
@@ -294,27 +247,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
-    shellany (0.0.1)
-    slop (3.6.0)
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    terminal-notifier-guard (1.5.3)
-    test-kitchen (1.16.0)
-      mixlib-install (>= 1.2, < 3.0)
-      mixlib-shellout (>= 1.2, < 3.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-gateway (~> 1.2)
-      safe_yaml (~> 1.0)
-      thor (~> 0.19, < 0.19.2)
     thor (0.19.1)
     thread_safe (0.3.6)
     timers (4.0.4)
@@ -324,7 +271,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
-    unicode_utils (1.4.0)
+    unicode-display_width (1.2.1)
     uuidtools (2.1.5)
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
@@ -334,7 +281,6 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    wdm (0.1.1)
     webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -342,7 +288,6 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    win32console (1.3.2)
     yard (0.9.9)
 
 PLATFORMS
@@ -354,28 +299,16 @@ DEPENDENCIES
   berkshelf!
   berkshelf-api!
   chef-zero (>= 4.0)
-  coolline
+  chefstyle
   dep_selector (>= 1.0)
   fuubar (>= 2.0)
   github_changelog_generator
-  growl
-  guard
-  guard-cucumber
-  guard-rspec
   http (>= 0.9.8)
-  libnotify (~> 0.8.0)
   rake (>= 10.1)
-  rb-fsevent
-  rb-inotify
-  rb-notifu (>= 0.0.4)
   rspec (>= 3.0)
   rspec-its (>= 1.2)
-  terminal-notifier-guard (~> 1.5.3)
-  test-kitchen (>= 1.2)
-  wdm
   webmock (>= 1.11)
-  win32console
   yard (>= 0.8)
 
 BUNDLED WITH
-   1.14.6
+   1.15.0

data/Rakefile

@@ -41,3 +41,13 @@ task :ci do
   Rake::Task[:spec].invoke
   Rake::Task[:features].invoke
 end
+
+begin
+  require "chefstyle"
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new(:style) do |task|
+    task.options += ["--display-cop-names", "--no-color"]
+  end
+rescue LoadError
+  puts "chefstyle/rubocop is not available.  gem install chefstyle to do style checking."
+end

data/appveyor.yml

@@ -16,10 +16,10 @@ branches:
 #   - vendor/bundle
 
 install:
-  - ps: iex (irm https://omnitruck.chef.io/install.ps1); Install-Project -Project chefdk -channel current
+  - ps: iex (irm https://omnitruck.chef.io/install.ps1); Install-Project -Project chefdk -channel stable
   - bundle config --local path vendor/bundle
   - SET CI=true
-  - SET BUNDLE_WITHOUT=guard:changelog:style
+  - SET BUNDLE_WITHOUT=changelog:style
 
 build_script:
   - ps: c:\opscode\chefdk\bin\chef.bat shell-init powershell | iex

data/berkshelf.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency "berkshelf-api-client", ">= 2.0.2", "< 4.0"
   s.add_dependency "buff-config",          "~> 2.0"
   s.add_dependency "buff-extensions",      "~> 2.0"
-  s.add_dependency "buff-shell_out",       "~> 1.0"
+  s.add_dependency "mixlib-shellout",      "~> 2.0"
   s.add_dependency "cleanroom",            "~> 1.0"
   s.add_dependency "faraday",              "~> 0.9"
   s.add_dependency "httpclient",           "~> 2.7"
@@ -45,4 +45,5 @@ Gem::Specification.new do |s|
   s.add_dependency "thor",                 "~> 0.19", "< 0.19.2"
   s.add_dependency "octokit",              "~> 4.0"
   s.add_dependency "mixlib-archive",       "~> 0.4"
+  s.add_dependency "concurrent-ruby",      "~> 1.0"
 end

data/features/commands/install.feature

@@ -634,3 +634,24 @@ Feature: berks install
     """
     Resolving cookbook dependencies...
     """
+
+  Scenario: when using a chef_repo source
+    Given I use a fixture named "complex-cookbook-path"
+    And a file named "Berksfile" with:
+      """
+      source chef_repo: '.'
+
+      cookbook 'jenkins-config'
+      """
+    When I successfully run `berks install`
+    Then the output should contain:
+      """
+      Installing jenkins (2.0.1) from
+      """
+    And the output should contain:
+      """
+      Installing jenkins-config (0.1.0) from
+      """
+    And the cookbook store should have the cookbooks:
+      | jenkins        | 2.0.1 |
+      | jenkins-config | 0.1.0 |

data/features/step_definitions/berksfile_steps.rb

@@ -39,7 +39,7 @@ Given /^I have a Berksfile at "(.+)" pointing at the local Berkshelf API with:$/
 end
 
 Given /I have a Berksfile pointing at an( authenticated)? Artifactory server with:/ do |authenticated, content|
-  if ENV['TEST_BERKSHELF_ARTIFACTORY']
+  if ENV["TEST_BERKSHELF_ARTIFACTORY"]
     steps %Q{
       Given a file named "Berksfile" with:
         """