berkshelf 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3c044813b795374171f93b2f322569f90023a4e
-  data.tar.gz: 62d856f5771494460d26522d0d0aa5cffc271041
+  metadata.gz: 23810cc3477151ea6ad270b191e2cef33d2780ad
+  data.tar.gz: 7e8b1976915c042696eee2efeb7eacc7e5659f3e
 SHA512:
-  metadata.gz: 63af223f748c800b3442d33c8ca2953112be8abd255289366ad2c5ee0f0782fa4db23041932241eacd49e9848669a04fbadadb0dd292c7d60ebd28f90079b7f8
-  data.tar.gz: 827896546961487a2f0bf1d41f5e4f9a36d0c868b1c86fd5abd4bef4fba55e91b644fb583fb195f0238aaf00505b21c174d7b86bbe8b71956f866619b15555f1
+  metadata.gz: 0379b051a09ad9de8bf4082e4516e2aa59909cb0ee6ead6a0a497d66a8bc603be336b4a6166b521a619267f5020ad2d30e88be4c5bb0191377e3c68291c7ca27
+  data.tar.gz: 70a3986955dbcef6ab3bb237bc952117e5c8d8a37a048abdd36b3293963b6627fd6a150a266480b0ac2f78dbdb151d3202be8a925d1156a9c64c9877cf9bd888

data/.gitignore

@@ -4,7 +4,6 @@
 .config
 .rvmrc
 .yardoc
-/Gemfile.lock
 _yardoc
 /coverage
 /doc/

data/.travis.yml

@@ -1,8 +1,21 @@
+addons:
+  apt:
+    packages:
+      - chef
+      - git
+      - graphviz
+      - libarchive12
+      - libarchive-dev
+      - libgecode-dev
+    sources:
+      - chef-stable-precise
+cache:
+  - apt
+  - bundler
+dist: precise
+env:
+  global: USE_SYSTEM_GECODE=1
 language: ruby
-rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
 notifications:
   irc:
     channels:
@@ -15,12 +28,34 @@ notifications:
 branches:
   only:
     - master
-env: USE_SYSTEM_GECODE=1
 bundler_args: --without guard --jobs 7
 before_install:
-  - sudo apt-get install -qq libarchive12 libarchive-dev libgecode-dev graphviz
+  - gem update --system
+  - gem install bundler
 before_script:
   - echo "StrictHostKeyChecking no" > ~/.ssh/config
   - git config --global user.email "ci@berkshelf.com"
   - git config --global user.name "Berkshelf"
+matrix:
+  include:
+    - rvm: 2.0.0
+    - rvm: 2.1
+    - rvm: 2.2
+    - rvm: 2.2
+      before_install:
+        # Failures in the berkshelf-api gemspec were happening with bundler 1.8
+        - gem install bundler --version=1.10.6
+        # Needed until https://github.com/travis-ci/apt-package-whitelist/pull/1820 is merged
+        - sudo apt-get update
+        - sudo apt-get -y install squid3
+      sudo: required
+      env:
+        - PROXY_TESTS_DIR=/tmp/proxy_tests
+        - PROXY_TESTS_REPO=$PROXY_TESTS_DIR/repo
+        - rvmsudo_secure_path=1
+      script:
+        - git clone https://github.com/chef/proxy_tests.git
+        - cd proxy_tests && chef-client -z -o proxy_tests::render && cd ..
+        - rvmsudo -E bundle exec bash $PROXY_TESTS_DIR/run_tests.sh berkshelf \* \* /tmp/out.txt
+      after_script: cat /tmp/out.txt
 script: bundle exec thor spec:ci

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 > This is a high level digest of changes. For the complete CHANGELOG diff two tags in the project's [commit history](https://github.com/berkshelf/berkshelf/commits/master).
 
+# 4.1.0
+
+* Enhancements
+  * Have berks install bump only required cookbooks
+  * Upgrade to solve 2.0 and use Gecode as the engine
+  * Add a new `solver` Berksfile DSL option
+  * remove berkshelf gem entry in generated Gemfile
+  * Run Chef proxy tests on Travis
+  * Updating Test Kitchen to 1.5.0 and running bundle update
+
+* Bug Fixes
+  * Use Net::HTTP.new instead of Net::HTTP.start to ensure environmental proxy settings are picked up
+  * Remove new cucumber and aruba warnings
+  * Pin aruba to 0.10.2
+
 # 4.0.1
 
 * Update `berkshelf-api-client` constraint to `~> 2.0`

data/CONTRIBUTING.md

@@ -51,3 +51,13 @@ By default, Berkshelf will only give you the top-level output from a failed comm
 isn't exactly helpful...
 
 Specify the `BERKSHELF_DEBUG` flag when running your command to see a full stack trace and other helpful debugging information.
+
+## Releasing
+
+Once you are ready to release Berkshelf, perform the following:
+
+1. Update `CHANGELOG.md` with a new header indicating the version to be released
+1. Examine the diff ([example](https://github.com/berkshelf/berkshelf/compare/v4.0.1...master)) between master and the previous version.  Add all merged Pull Requests to the `CHANGELOG.md`
+1. Update `version.rb` to the desired release version
+1. Create a PR and review the `version.rb` changes and `CHANGELOG.md` changes
+1. Once the PR is merged to master, run `rake release` on the master branch

data/Gemfile.lock

@@ -0,0 +1,332 @@
+GIT
+  remote: https://github.com/berkshelf/berkshelf-api.git
+  revision: 27c00fd297bc6bc38bd283e1d689ade3605dc981
+  specs:
+    berkshelf-api (2.1.1)
+      archive (= 0.0.6)
+      buff-config (~> 1.0)
+      celluloid (~> 0.16.0.pre)
+      celluloid-io (~> 0.16.0.pre)
+      grape (~> 0.6)
+      grape-msgpack (~> 0.1)
+      hashie (>= 2.0.4, < 4.0.0)
+      octokit (>= 3.0.0, < 5.0.0)
+      reel (~> 0.5.0)
+      ridley (~> 4.0)
+      semverse (~> 1.0)
+      varia_model (>= 0.4.0, < 0.5.0)
+
+PATH
+  remote: .
+  specs:
+    berkshelf (4.1.0)
+      addressable (~> 2.3.4)
+      berkshelf-api-client (~> 2.0)
+      buff-config (~> 1.0)
+      buff-extensions (~> 1.0)
+      buff-shell_out (~> 0.1)
+      celluloid (= 0.16.0)
+      celluloid-io (~> 0.16.1)
+      cleanroom (~> 1.0)
+      faraday (~> 0.9.0)
+      httpclient (~> 2.6.0)
+      minitar (~> 0.5.4)
+      octokit (~> 4.0)
+      retryable (~> 2.0)
+      ridley (~> 4.3)
+      solve (~> 2.0)
+      thor (~> 0.19)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.5)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.3.8)
+    archive (0.0.6)
+      ffi (~> 1.9.3)
+    aruba (0.10.2)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    berkshelf-api-client (2.0.0)
+      faraday (~> 0.9.1)
+      httpclient (~> 2.6.0)
+    buff-config (1.0.1)
+      buff-extensions (~> 1.0)
+      varia_model (~> 0.4)
+    buff-extensions (1.0.0)
+    buff-ignore (1.1.1)
+    buff-ruby_engine (0.1.0)
+    buff-shell_out (0.2.0)
+      buff-ruby_engine (~> 0.1.0)
+    builder (3.2.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    celluloid-io (0.16.2)
+      celluloid (>= 0.16.0)
+      nio4r (>= 1.1.0)
+    chef-config (12.6.0)
+      mixlib-config (~> 2.0)
+      mixlib-shellout (~> 2.0)
+    chef-zero (4.4.2)
+      ffi-yajl (~> 2.2)
+      hashie (>= 2.0, < 4.0)
+      mixlib-log (~> 1.3)
+      rack
+      uuidtools (~> 2.1)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cleanroom (1.0.0)
+    coderay (1.1.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    contracts (0.12.0)
+    coolline (0.4.4)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    cucumber (2.3.2)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.4.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 3.2.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.4.0)
+      gherkin (~> 3.2.0)
+    cucumber-wire (0.0.1)
+    dep-selector-libgecode (1.0.2)
+    dep_selector (1.0.3)
+      dep-selector-libgecode (~> 1.0)
+      ffi (~> 1.9)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    domain_name (0.5.25)
+      unf (>= 0.0.5, < 1.0.0)
+    equalizer (0.0.11)
+    erubis (2.7.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.10)
+    ffi-yajl (2.2.3)
+      libyajl2 (~> 1.2)
+    formatador (0.2.5)
+    fuubar (2.0.0)
+      rspec (~> 3.0)
+      ruby-progressbar (~> 1.4)
+    gherkin (3.2.0)
+    grape (0.14.0)
+      activesupport
+      builder
+      hashie (>= 2.1.0)
+      multi_json (>= 1.3.2)
+      multi_xml (>= 0.5.2)
+      rack (>= 1.3.0)
+      rack-accept
+      rack-mount
+      virtus (>= 1.0.0)
+    grape-msgpack (0.1.2)
+      grape (>= 0.6.0)
+      msgpack (~> 0.5.6)
+    growl (1.0.3)
+    guard (1.8.3)
+      formatador (>= 0.2.4)
+      listen (~> 1.3)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-compat (1.2.1)
+    guard-cucumber (2.0.0)
+      cucumber (~> 2.0)
+      guard-compat (~> 1.0)
+      nenv (~> 0.1)
+    guard-rspec (1.2.2)
+      guard (>= 1.1)
+    guard-spork (1.5.2)
+      childprocess (>= 0.2.3)
+      guard (~> 1.1)
+      spork (>= 0.8.4)
+    hashdiff (0.2.3)
+    hashie (3.4.3)
+    hitimes (1.2.3)
+    http (0.9.8)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 1.0.1)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    http-form_data (1.0.1)
+    http_parser.rb (0.6.0)
+    httpclient (2.6.0.1)
+    i18n (0.7.0)
+    ice_nine (0.11.1)
+    json (1.8.3)
+    libyajl2 (1.2.0)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    lumberjack (1.0.10)
+    method_source (0.8.2)
+    minitar (0.5.4)
+    minitest (5.8.4)
+    mixlib-authentication (1.4.0)
+      mixlib-log
+      rspec-core (~> 3.2)
+      rspec-expectations (~> 3.2)
+      rspec-mocks (~> 3.2)
+    mixlib-config (2.2.1)
+    mixlib-install (0.7.1)
+    mixlib-log (1.6.0)
+    mixlib-shellout (2.2.5)
+    molinillo (0.2.3)
+    msgpack (0.5.12)
+    multi_json (1.11.2)
+    multi_test (0.1.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nenv (0.2.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (3.0.2)
+    nio4r (1.2.0)
+    octokit (4.2.0)
+      sawyer (~> 0.6.0, >= 0.5.3)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.4)
+    rack-accept (0.4.5)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rake (10.5.0)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.4)
+      ffi (>= 0.5.0)
+    reel (0.5.0)
+      celluloid (>= 0.15.1)
+      celluloid-io (>= 0.15.0)
+      http (>= 0.6.0.pre)
+      http_parser.rb (>= 0.6.0)
+      websocket_parser (>= 0.1.6)
+    retryable (2.0.3)
+    ridley (4.4.2)
+      addressable
+      buff-config (~> 1.0)
+      buff-extensions (~> 1.0)
+      buff-ignore (~> 1.1)
+      buff-shell_out (~> 0.1)
+      celluloid (~> 0.16.0)
+      celluloid-io (~> 0.16.1)
+      chef-config
+      erubis
+      faraday (~> 0.9.0)
+      hashie (>= 2.0.2, < 4.0.0)
+      httpclient (~> 2.6)
+      json (>= 1.7.7)
+      mixlib-authentication (>= 1.3.0)
+      retryable (~> 2.0)
+      semverse (~> 1.1)
+      varia_model (~> 0.4.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    ruby-progressbar (1.7.5)
+    safe_yaml (1.0.4)
+    sawyer (0.6.0)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
+    semverse (1.2.1)
+    slop (3.6.0)
+    solve (2.0.1)
+      molinillo (~> 0.2.3)
+      semverse (~> 1.1)
+    spork (0.9.2)
+    test-kitchen (1.5.0)
+      chef-config (>= 12.5.1)
+      mixlib-install (~> 0.7)
+      mixlib-shellout (>= 1.2, < 3.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.9, < 4.0)
+      safe_yaml (~> 1.0)
+      thor (~> 0.18)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    timers (4.0.4)
+      hitimes
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
+    uuidtools (2.1.5)
+    varia_model (0.4.1)
+      buff-extensions (~> 1.0)
+      hashie (>= 2.0.2, < 4.0.0)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+    webmock (1.22.6)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    websocket_parser (1.0.0)
+    yard (0.8.7.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba (~> 0.10.0)
+  berkshelf!
+  berkshelf-api!
+  chef-zero (~> 4.0)
+  coolline (~> 0.4.2)
+  dep_selector (~> 1.0)
+  fuubar (~> 2.0)
+  growl
+  guard (~> 1.8)
+  guard-cucumber
+  guard-rspec
+  guard-spork
+  http (~> 0.9.8)
+  rake (~> 10.1)
+  rb-fsevent
+  rspec (~> 3.0)
+  spork (~> 0.9)
+  test-kitchen (~> 1.2)
+  webmock (~> 1.11)
+  yard (~> 0.8)
+
+BUNDLED WITH
+   1.11.2