berkshelf 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c2cbd226c97f7eb03ba011273102912c1ab35c3
-  data.tar.gz: 41a2609f4d1ea587b37be2e78f9a965408f801c2
+  metadata.gz: 0b9ee0bbcbb69dc7f55aaf3ca127f9dbd3b2dafc
+  data.tar.gz: 71e33ba4b6f966b65c8531cb01dc901e7abceeb6
 SHA512:
-  metadata.gz: f1fb76696aa23da536edce710c03a1da9abe896470ccbed29713c97681f713d5213229804841566b5e5e908c3fc7f2f2465ccf871b36c8f2ced7bdaabd71678e
-  data.tar.gz: 907002c134b4c2294895dc3889fa32e52d71bb762c0c4298df6b4632e352836e645e5ed4746c8740f47ef9efcfa24be9a7a2a09905737ae4c83e47304d880318
+  metadata.gz: cd70423af3cc72518f759619d2ed4706299a95626915cb45f312390cfadbdda46629ef0c5c106bbd2c919fd4f3369f5b82ee6a7801460d18765595951e20d287
+  data.tar.gz: c88ac3755f5f54469e2af5af73ec09b03d360045990daf7bf99a9badf2be0db3b16b914f3811a7d4fc597aa5cbf40a9aa0af3d24b679a11440315db9139bc7c0

data/CHANGELOG.md

@@ -1,11 +1,17 @@
 > 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).
 
+# 3.1.5
+
+* Bug Fixes
+  * Supermarket endpoint is now an alias for Opscode endpoint
+  * Set proper default value for supermarket api endpoint
+
 # 3.1.4
 
 * Improvements
   * Update the default vagrant box from the generators to Ubuntu 14.04 (formerly 12.04 EOL)
 
-* Bug fixes
+* Bug Fixes
   * Handle the case where a remote source had been removed but still existed in the lockfile
   * Follow redirects (HTTP -> HTTPS) in all requests
 
@@ -14,7 +20,7 @@
 * Enhancements
   * Updated out of date dependencies
 
-* Bug fixes
+* Bug Fixes
   * Skip loading of cached cookbooks that do not have a value for metadata
   * SSL Verify option will be respected when communicating to an API server
   * Fixed issue where some commands were unexpectedly crashing instead of informing the user that Git is not installed

data/features/commands/search.feature

@@ -11,6 +11,6 @@ Feature: berks search
     * the output should contain:
       """
       berkshelf-api (1.0.0)
-      berkshelf-api-server (1.4.0)
+      berkshelf-api-server (2.0.0)
       berkshelf-cookbook-fixture (1.0.0)
       """

data/generator_files/CHANGELOG.md.erb

@@ -1,9 +1,3 @@
 # 0.1.0
 
 Initial release of <%= name %>
-
-* Enhancements
-  * an enhancement
-
-* Bug Fixes
-  * a bug fix

data/generator_files/Gemfile.erb

@@ -6,7 +6,7 @@ gem 'berkshelf'
 #
 # group :development do
 #   gem "berkshelf", github: "berkshelf/berkshelf"
-#   gem "vagrant", github: "mitchellh/vagrant", tag: "v1.5.2"
+#   gem "vagrant", github: "mitchellh/vagrant", tag: "v1.6.3"
 # end
 #
 # group :plugins do

data/generator_files/README.md.erb

@@ -37,15 +37,6 @@ Include `<%= name %>` in your node's `run_list`:
 }
 ```
 
-## Contributing
-
-1. Fork the repository on Github
-2. Create a named feature branch (i.e. `add-new-recipe`)
-3. Write your change
-4. Write tests for your change (if applicable)
-5. Run the tests, ensuring they all pass
-6. Submit a Pull Request
-
 ## License and Authors
 
 Author:: <%= maintainer %> (<<%= maintainer_email %>>)

data/lib/berkshelf/community_rest.rb

@@ -48,7 +48,7 @@ module Berkshelf
         end
     end
 
-    V1_API = 'https://cookbooks.opscode.com/api/v1'.freeze
+    V1_API = 'https://supermarket.getchef.com'.freeze
 
     # @return [String]
     attr_reader :api_uri

data/lib/berkshelf/cookbook_generator.rb

@@ -2,6 +2,16 @@ module Berkshelf
   class CookbookGenerator < BaseGenerator
     require_relative 'config'
 
+    LICENSE_MAP = {
+      "apachev2" => "Apache 2.0",
+      "gplv2"    => "GNU Public License 2.0",
+      "gplv3"    => "GNU Public License 3.0",
+      "mit"      => "MIT",
+      "reserved" => "All rights reserved",
+    }.freeze
+
+    (LICENSES = LICENSE_MAP.keys).freeze
+
     argument :name,
       type: :string,
       required: true
@@ -83,14 +93,8 @@ module Berkshelf
       end
 
       def license_name
-        case options[:license]
-        when 'apachev2'; 'Apache 2.0'
-        when 'gplv2'; 'GNU Public License 2.0'
-        when 'gplv3'; 'GNU Public License 3.0'
-        when 'mit'; 'MIT'
-        when 'reserved'; 'All rights reserved'
-        else
-          raise Berkshelf::LicenseNotFound.new(options[:license])
+        LICENSE_MAP.fetch(options[:license]) do |license|
+          raise Berkshelf::LicenseNotFound.new(license)
         end
       end
 

data/lib/berkshelf/downloader.rb

@@ -49,7 +49,7 @@ module Berkshelf
       end
 
       case remote_cookbook.location_type
-      when :opscode
+      when :opscode, :supermarket
         CommunityREST.new(remote_cookbook.location_path).download(name, version)
       when :chef_server
         # @todo Dynamically get credentials for remote_cookbook.location_path

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 end

data/spec/unit/berkshelf/downloader_spec.rb

@@ -1,11 +1,39 @@
 require 'spec_helper'
 
 describe Berkshelf::Downloader do
+  let(:berksfile) { double('berksfile') }
+  subject { described_class.new(berksfile) }
+
   describe "#download" do
     pending
   end
 
   describe "#try_download" do
-    pending
+    let(:remote_cookbook) { double('remote-cookbook') }
+    let(:source) do
+      source = double('source')
+      allow(source).to receive(:cookbook) { remote_cookbook }
+      source
+    end
+    let(:name) { "fake" }
+    let(:version) { "1.0.0" }
+
+    it "supports the 'opscode' location type" do
+      allow(remote_cookbook).to receive(:location_type) { :opscode }
+      allow(remote_cookbook).to receive(:location_path) { "http://api.opscode.com" }
+      rest = double('community-rest')
+      expect(Berkshelf::CommunityREST).to receive(:new).with("http://api.opscode.com") { rest }
+      expect(rest).to receive(:download).with(name, version)
+      subject.try_download(source, name, version)
+    end
+
+    it "supports the 'supermarket' location type" do
+      allow(remote_cookbook).to receive(:location_type) { :supermarket }
+      allow(remote_cookbook).to receive(:location_path) { "http://api.supermarket.com" }
+      rest = double('community-rest')
+      expect(Berkshelf::CommunityREST).to receive(:new).with("http://api.supermarket.com") { rest }
+      expect(rest).to receive(:download).with(name, version)
+      subject.try_download(source, name, version)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable