chef-dk 1.1.16 → 1.2.20

data/spec/unit/policyfile/cookbook_location_specification_spec.rb

@@ -272,6 +272,28 @@ describe ChefDK::Policyfile::CookbookLocationSpecification do
       expect(cookbook_location_spec).to be_valid
     end
 
+  end
+
+  describe "when created with a chef_server source" do
+
+    let(:source_options) { { chef_server: "https://api.opscode.com/organizations/chef-oss-dev/cookbooks/my_cookbook/versions/2.0.0/download" } }
+
+    it "has a chef_server installer" do
+      expect(cookbook_location_spec.installer).to be_a_kind_of(CookbookOmnifetch::ChefServerLocation)
+    end
+
+    it "does not have a fixed version" do
+      expect(cookbook_location_spec.version_fixed?).to be false
+    end
+
+    it "is a mirror of a canonical upstream" do
+      expect(cookbook_location_spec.mirrors_canonical_upstream?).to be true
+    end
+
+    it "is valid" do
+      expect(cookbook_location_spec.errors.size).to eq(0)
+      expect(cookbook_location_spec).to be_valid
+    end
 
   end
 end

data/spec/unit/policyfile/source_uri_spec.rb

@@ -0,0 +1,36 @@
+#
+# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+require 'chef-dk/policyfile/source_uri'
+
+describe ChefDK::Policyfile::SourceURI do
+  subject { described_class.parse(source_uri) }
+
+  describe '#validate' do
+    context 'when the scheme is not https' do
+      let(:source_uri) { 'ftp://chef.example.com' }
+
+      it 'raises ChefDK::InvalidPolicyfileSourceURI' do
+        expect do
+          subject.validate
+        end.to raise_error(ChefDK::InvalidPolicyfileSourceURI)
+      end
+    end
+  end
+end

data/spec/unit/policyfile/storage_config_spec.rb

@@ -115,6 +115,18 @@ describe ChefDK::Policyfile::StorageConfig do
 
     end
 
+    context "when the policyfile file name is actually a lockfile" do
+
+      before do
+        storage_config.use_policyfile("foo.lock.json")
+      end
+
+      it "uses the policyfile .rb file instead" do
+        expect(storage_config.policyfile_filename).to eq("foo.rb")
+      end
+
+    end
+
   end
 
 

data/spec/unit/policyfile_services/push_spec.rb

@@ -87,6 +87,22 @@ describe ChefDK::PolicyfileServices::Push do
 
   end
 
+  context "when given a path to a Policyfile.lock.json instead of an rb" do
+
+    let(:policyfile_rb_name) { "MyPolicy.rb" }
+
+    let(:policyfile_lock_name) { "MyPolicy.lock.json" }
+
+    let(:push_service) { described_class.new(policyfile: policyfile_lock_name, policy_group: policy_group, ui: ui, config: config, root_dir: working_dir) }
+
+    it "loads the correct policyfile" do
+      storage_config = push_service.storage_config
+      expect(storage_config.policyfile_lock_filename).to eq(policyfile_lock_path)
+      expect(storage_config.policyfile_filename).to eq(policyfile_rb_path)
+    end
+
+  end
+
   context "when no lockfile is present" do
 
     it "errors out" do

data/version_policy.rb

@@ -47,9 +47,9 @@ OMNIBUS_OVERRIDES = {
   # software def so we don't need to override that
   "libzmq" => "4.0.5",
 
-  ## These can float as they are frequently updated in a way that works for us
-  #override "cacerts" =>"???",
-  #override "openssl" =>"???",
+  # For 1.2 stable release only, pin to 1.1.0 of kitchen-dokken. After the 1.2
+  # release, unpin and bring in kitchen-dokken 2.x.
+  "kitchen-dokken" => "1.1.0"
 }
 
 #
@@ -60,7 +60,7 @@ OMNIBUS_OVERRIDES = {
 # name of the rubygem (gem list -re <rubygem name> gets us the latest version).
 #
 OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = {
-  #rubygems: "rubygems-update", # pinned to 2.6.4 until https://github.com/rubygems/rubygems/pull/1683 is released
+  rubygems: "rubygems-update",
   # bundler: "bundler", # pinned to 1.12.5 until we figure out how we're failing on 1.13.0
 }
 
@@ -76,7 +76,7 @@ ACCEPTABLE_OUTDATED_GEMS = [
   "activesupport",     # anchored by outdated google-api-client
   "celluloid",         # ridley requires 0.16.x
   "celluloid-io",      # ridley requires 0.16.x
-  "cucumber-core", # Until cucumber 2.0
+  "cucumber-core",     # Until cucumber 2.0
   "fog-cloudatcost",   # fog restricts this for probably no good reason
   "fog-dynect",        # fog restricts this for probably no good reason
   "fog-google",        # fog-google 0.2+ requires Ruby 2.0+, fog 2.0.0 will include it
@@ -88,6 +88,10 @@ ACCEPTABLE_OUTDATED_GEMS = [
   "rubocop",           # cookstyle pins to 0.39.0 in 0.0.1
   "slop",              # expected to disappear with pry 0.11
   "timers",            # anchored by outdated celluloid
+  "github_changelog_generator", # we use a forked version that differs from rubygems
+  "addressable",       # sawyer limits to < 2.6
+  "faraday",           # ridely restrcits this 0.9.x
+  "thor",              # berkshelf restricts this to < 0.19.2
 
   # We have a task called update_stable_channel_gems which scans and pins to the
   # latest released chef/chef-config/opscode-pushy-client but it pulls from the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.2.20
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -90,38 +90,58 @@ dependencies:
         version: '12.5'
 - !ruby/object:Gem::Dependency
   name: solve
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.3.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.3.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: cookbook-omnifetch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -326,6 +346,7 @@ files:
 - lib/chef-dk/policyfile/reports/table_printer.rb
 - lib/chef-dk/policyfile/reports/upload.rb
 - lib/chef-dk/policyfile/solution_dependencies.rb
+- lib/chef-dk/policyfile/source_uri.rb
 - lib/chef-dk/policyfile/storage_config.rb
 - lib/chef-dk/policyfile/undo_record.rb
 - lib/chef-dk/policyfile/undo_stack.rb
@@ -484,6 +505,8 @@ files:
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/chefignore
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/metadata.rb
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/recipes/default.rb
+- spec/unit/fixtures/cookbooks_api/chef_server_universe.json
+- spec/unit/fixtures/cookbooks_api/pruned_chef_server_universe.json
 - spec/unit/fixtures/cookbooks_api/pruned_small_universe.json
 - spec/unit/fixtures/cookbooks_api/small_universe.json
 - spec/unit/fixtures/cookbooks_api/universe.json
@@ -564,6 +587,7 @@ files:
 - spec/unit/policyfile/reports/install_spec.rb
 - spec/unit/policyfile/reports/upload_spec.rb
 - spec/unit/policyfile/solution_dependencies_spec.rb
+- spec/unit/policyfile/source_uri_spec.rb
 - spec/unit/policyfile/storage_config_spec.rb
 - spec/unit/policyfile/undo_record_spec.rb
 - spec/unit/policyfile/undo_stack_spec.rb
@@ -632,7 +656,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A streamlined development and deployment workflow for Chef platform.
@@ -711,6 +735,8 @@ test_files:
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/chefignore
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/metadata.rb
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/recipes/default.rb
+- spec/unit/fixtures/cookbooks_api/chef_server_universe.json
+- spec/unit/fixtures/cookbooks_api/pruned_chef_server_universe.json
 - spec/unit/fixtures/cookbooks_api/pruned_small_universe.json
 - spec/unit/fixtures/cookbooks_api/small_universe.json
 - spec/unit/fixtures/cookbooks_api/universe.json
@@ -791,6 +817,7 @@ test_files:
 - spec/unit/policyfile/reports/install_spec.rb
 - spec/unit/policyfile/reports/upload_spec.rb
 - spec/unit/policyfile/solution_dependencies_spec.rb
+- spec/unit/policyfile/source_uri_spec.rb
 - spec/unit/policyfile/storage_config_spec.rb
 - spec/unit/policyfile/undo_record_spec.rb
 - spec/unit/policyfile/undo_stack_spec.rb