clc-promote 0.8.7 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff33029edf1c248f6ab90181a88f21dd512abe04
-  data.tar.gz: d1d8ddebce905d413641409e34c63a83b06be53a
+  metadata.gz: 02fb88582f6f5de1f9a927eb25e0434111743ec4
+  data.tar.gz: 2da80ba5d93f20956df5bfaa051a33703880d38c
 SHA512:
-  metadata.gz: 993e2517da78c81f045663462df22d875f38cfb685db461df27c514024635b0758752e5d99029cc69033ba7268d76df30be5e8e982694fc6121cfcc4bb92a401
-  data.tar.gz: 049903fd9fbef0bac761206eb586e09f6a724dd7c7d8889b5727cf31b0cffede33cad009dfb41dc77eb1905f024d0599d3908c628fe3c4910c736d962cd40b89
+  metadata.gz: 79fd93f45d3707dd0d275920832354d94e70ceb7e57cad50a51e8b8695ebd60814f2c70965590b54df89280b804bd91e0fd41b7cf032014686f0c2db144ab68e
+  data.tar.gz: 4261f92aa90eb3f283c74488624618e489ac242b5a396216a52708d292c76b04d3ce8432660475bc160d6e943769bc353e75ab9a54b867a51b1a354ace7d5ed6

data/Rakefile

@@ -13,6 +13,11 @@ module Bundler
   end
 end
 
+require "rubocop/rake_task"
+RuboCop::RakeTask.new(:style) do |task|
+  task.options << "--display-cop-names"
+end
+
 RSpec::Core::RakeTask.new(:test)
 
-task :default => [:test]
+task :default => [:test, :style]

data/clc-promote.gemspec

@@ -1,4 +1,4 @@
-$:.unshift(File.dirname(__FILE__) + '/lib')
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/lib')
 require 'promote/version'
 
 Gem::Specification.new do |s|

data/lib/promote/cookbook.rb

@@ -79,8 +79,8 @@ module Promote
     end
 
     def dependency_hash(environment_cookbook_name)
-      cb_changes = sync_latest_app_cookbooks(environment_cookbook_name)
-      hash_src = ""
+      sync_latest_app_cookbooks(environment_cookbook_name)
+      hash_src = ''
       dependencies.each do | k,v |
         hash_src << "#{k}::#{v}::"
       end

data/lib/promote/node_finder.rb

@@ -1,17 +1,19 @@
 module Promote
   class NodeFinder
+
+    include ChefServer
+
     def initialize(query, config)
       @query = query
       @config = config
-      Chef::Config.reset
-      Chef::Config[:client_key] = config.client_key
-      Chef::Config[:chef_server_url] = config.chef_server_url
-      Chef::Config[:node_name] = config.node_name
       @searcher = Chef::Search::Query.new
     end
 
     def search
-      results = @searcher.search(:node, @query)
+      results = []
+      with_chef_server(@config) do
+        results = @searcher.search(:node, @query)
+      end
       results[0]
     end
   end

data/lib/promote/promoter.rb

@@ -2,6 +2,9 @@ require 'json'
 
 module Promote
   class Promoter
+
+    include ChefServer
+
     attr_accessor :config
 
     def initialize(config = Config.new)
@@ -84,17 +87,19 @@ module Promote
     private
 
     def download_files(local_root, path, cookbook_version = nil)
-      fs_config = Chef::ChefFS::Config.new(Chef::Config, cwd = Dir.pwd, {:cookbook_version => cookbook_version})
-      pattern = Chef::ChefFS::FilePattern.new(path)
-      local = Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir.new(
-        {
-          'environments' => ["#{local_root}/environments"],
-          'data_bags' => ["#{local_root}/data_bags"],
-          'roles' => ["#{local_root}/roles"],
-          'cookbooks' => ["#{local_root}/cookbooks"]
-        }
-      )
-      Chef::ChefFS::FileSystem.copy_to(pattern, fs_config.chef_fs, local, nil, Chef::Config)
+      with_chef_server(config) do
+        fs_config = Chef::ChefFS::Config.new(Chef::Config, cwd = Dir.pwd, {:cookbook_version => cookbook_version})
+        pattern = Chef::ChefFS::FilePattern.new(path)
+        local = Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir.new(
+          {
+            'environments' => ["#{local_root}/environments"],
+            'data_bags' => ["#{local_root}/data_bags"],
+            'roles' => ["#{local_root}/roles"],
+            'cookbooks' => ["#{local_root}/cookbooks"]
+          }
+        )
+        Chef::ChefFS::FileSystem.copy_to(pattern, fs_config.chef_fs, local, nil, Chef::Config)
+      end
     end
 
     def check_promotion(environment_to_check, probe_interval, max_wait, ui)

data/lib/promote/version.rb

@@ -1,3 +1,3 @@
 module Promote
-  VERSION = '0.8.7'
+  VERSION = '0.9.4'
 end

data/spec/unit/promote/config_spec.rb

@@ -1,144 +1,155 @@
 require 'promote'
 
 describe Promote::Config do
-	let(:opts) {{
-		:repo_root => "root",
-		:cookbook_directory => "cookbooks",
-		:environment_directory => "environments",
-		:data_bag_directory => "data_bags",
-		:role_directory => "roles",
-		:temp_directory => "temp",
-		:node_name => "user",
-		:client_key => "key",
-		:chef_server_url => "url",
-		:bags => ['foo']}}
-	subject { Promote::Config.new(opts) }
+  let(:opts) do
+    {
+      repo_root: 'root',
+      cookbook_directory: 'cookbooks',
+      environment_directory: 'environments',
+      data_bag_directory: 'data_bags',
+      role_directory: 'roles',
+      temp_directory: 'temp',
+      node_name: 'user',
+      client_key: 'key',
+      chef_server_url: 'url',
+      bags: ['foo']
+    }
+  end
+  let(:repo_root) { subject.repo_root }
 
-	it "assigns options to node_name attribute" do
-		expect(subject.node_name).to eq(opts[:node_name])
-	end
-	it "assigns options to client_key attribute" do
-		expect(subject.client_key).to eq(opts[:client_key])
-	end
-	it "assigns options to chef_server_url attribute" do
-		expect(subject.chef_server_url).to eq(opts[:chef_server_url])
-	end
-	it "assigns options to repo_root attribute" do
-		expect(subject.repo_root).to eq(opts[:repo_root])
-	end
-	it "assigns options to cookbook_directory attribute" do
-		expect(subject.cookbook_directory).to eq(opts[:cookbook_directory])
-	end
-	it "assigns options to data_bag_directory attribute" do
-		expect(subject.data_bag_directory).to eq(opts[:data_bag_directory])
-	end
-	it "assigns options to environment_directory attribute" do
-		expect(subject.environment_directory).to eq(opts[:environment_directory])
-	end
-	it "assigns options to role_directory attribute" do
-		expect(subject.role_directory).to eq(opts[:role_directory])
-	end
-	it "assigns options to temp_directory attribute" do
-		expect(subject.temp_directory).to eq(opts[:temp_directory])
-	end
-	it "assigns options to bags attribute" do
-		expect(subject.bags).to eq(opts[:bags])
-	end
-	it "can correctly convert to a hash" do
-		hash = subject.to_hash
-		expect(hash[:repo_root]).to eq(opts[:repo_root])
-	end
+  subject { Promote::Config.new(opts) }
 
-	context "directories are not in options" do
-		let(:opts) {{
-			:node_name => "user",
-			:client_key => "key",
-			:chef_server_url => "url"}}
+  it 'assigns options to node_name attribute' do
+    expect(subject.node_name).to eq(opts[:node_name])
+  end
+  it 'assigns options to client_key attribute' do
+    expect(subject.client_key).to eq(opts[:client_key])
+  end
+  it 'assigns options to chef_server_url attribute' do
+    expect(subject.chef_server_url).to eq(opts[:chef_server_url])
+  end
+  it 'assigns options to repo_root attribute' do
+    expect(subject.repo_root).to eq(opts[:repo_root])
+  end
+  it 'assigns options to cookbook_directory attribute' do
+    expect(subject.cookbook_directory).to eq(opts[:cookbook_directory])
+  end
+  it 'assigns options to data_bag_directory attribute' do
+    expect(subject.data_bag_directory).to eq(opts[:data_bag_directory])
+  end
+  it 'assigns options to environment_directory attribute' do
+    expect(subject.environment_directory).to eq(opts[:environment_directory])
+  end
+  it 'assigns options to role_directory attribute' do
+    expect(subject.role_directory).to eq(opts[:role_directory])
+  end
+  it 'assigns options to temp_directory attribute' do
+    expect(subject.temp_directory).to eq(opts[:temp_directory])
+  end
+  it 'assigns options to bags attribute' do
+    expect(subject.bags).to eq(opts[:bags])
+  end
+  it 'can correctly convert to a hash' do
+    hash = subject.to_hash
+    expect(hash[:repo_root]).to eq(opts[:repo_root])
+  end
 
-		it "assigns repo_root to pwd" do
-			expect(subject.repo_root).to eq(Dir.pwd)
-		end
-		it "assigns cookbook_directory to cookbooks off root" do
-			expect(subject.cookbook_directory).to eq(File.join(subject.repo_root, "cookbooks"))
-		end
-		it "assigns data_bag_directory to data_bags off root" do
-			expect(subject.data_bag_directory).to eq(File.join(subject.repo_root, "data_bags"))
-		end
-		it "assigns environment_directory to environments off root" do
-			expect(subject.environment_directory).to eq(File.join(subject.repo_root, "environments"))
-		end
-		it "assigns role_directory to roles off root" do
-			expect(subject.role_directory).to eq(File.join(subject.repo_root, "roles"))
-		end
-		it "assigns temp_directory to tmp" do
-			expect(subject.temp_directory).to eq("/tmp/promote")
-		end
-	end
+  context 'directories are not in options' do
+    let(:opts) do
+      {
+        node_name: 'user',
+        client_key: 'key',
+        chef_server_url: 'url'
+      }
+    end
 
-  context "no --data-bag option is specified" do
-		let(:opts) {{
-			:node_name => "user",
-			:client_key => "key",
-			:chef_server_url => "url"}}
+    it 'assigns repo_root to pwd' do
+      expect(repo_root).to eq(Dir.pwd)
+    end
+    it 'assigns cookbook_directory to cookbooks off root' do
+      expect(subject.cookbook_directory).to eq("#{repo_root}/cookbooks")
+    end
+    it 'assigns data_bag_directory to data_bags off root' do
+      expect(subject.data_bag_directory).to eq("#{repo_root}/data_bags")
+    end
+    it 'assigns environment_directory to environments off root' do
+      expect(subject.environment_directory).to eq("#{repo_root}/environments")
+    end
+    it 'assigns role_directory to roles off root' do
+      expect(subject.role_directory).to eq("#{repo_root}/roles")
+    end
+    it 'assigns temp_directory to tmp' do
+      expect(subject.temp_directory).to eq('/tmp/promote')
+    end
+  end
 
-		it "defaults to secrets_*" do
-			expect(subject.bags).to eq(['secrets_*'])
-		end
-	end
+  context 'no --data-bag option is specified' do
+    let(:opts) do
+      {
+        node_name: 'user',
+        client_key: 'key',
+        chef_server_url: 'url'
+      }
+    end
 
-	context "directories are not in options but repo root is" do
-		let(:opts) {{
-			:repo_root => "root",
-			:node_name => "user",
-			:client_key => "key",
-			:chef_server_url => "url"}}
+    it 'defaults to secrets_*' do
+      expect(subject.bags).to eq(['secrets_*'])
+    end
+  end
 
-		it "assigns repo_root to pwd" do
-			expect(subject.repo_root).to eq(opts[:repo_root])
-		end
-		it "assigns cookbook_directory to cookbooks off root" do
-			expect(subject.cookbook_directory).to eq(File.join(subject.repo_root, "cookbooks"))
-		end
-		it "assigns data_bag_directory to data_bags off root" do
-			expect(subject.data_bag_directory).to eq(File.join(subject.repo_root, "data_bags"))
-		end
-		it "assigns environment_directory to environments off root" do
-			expect(subject.environment_directory).to eq(File.join(subject.repo_root, "environments"))
-		end
-		it "assigns role_directory to roles off root" do
-			expect(subject.role_directory).to eq(File.join(subject.repo_root, "roles"))
-		end
-		it "assigns temp_directory to tmp" do
-			expect(subject.temp_directory).to eq("/tmp/promote")
-		end
-	end
+  context 'directories are not in options but repo root is' do
+    let(:opts) do
+      {
+        repo_root: 'root',
+        node_name: 'user',
+        client_key: 'key',
+        chef_server_url: 'url'
+      }
+    end
 
-	context "reset_temp_dir" do
-		after {
-			FileUtils.rm_rf(opts[:temp_directory])
-		}
+    it 'assigns repo_root to pwd' do
+      expect(repo_root).to eq(opts[:repo_root])
+    end
+    it 'assigns cookbook_directory to cookbooks off root' do
+      expect(subject.cookbook_directory).to eq("#{repo_root}/cookbooks")
+    end
+    it 'assigns data_bag_directory to data_bags off root' do
+      expect(subject.data_bag_directory).to eq("#{repo_root}/data_bags")
+    end
+    it 'assigns environment_directory to environments off root' do
+      expect(subject.environment_directory).to eq("#{repo_root}/environments")
+    end
+    it 'assigns role_directory to roles off root' do
+      expect(subject.role_directory).to eq("#{repo_root}/roles")
+    end
+    it 'assigns temp_directory to tmp' do
+      expect(subject.temp_directory).to eq('/tmp/promote')
+    end
+  end
 
-		context "temp dir is populated" do
-			before {
-				opts[:temp_directory] = "/tmp/promote_tests"
-				Dir.mkdir(opts[:temp_directory])
-				FileUtils.touch(File.join(opts[:temp_directory], 'file.txt'))
-			}
+  context 'reset_temp_dir' do
+    after { FileUtils.rm_rf(opts[:temp_directory]) }
 
-			it "empties the temp directory" do
-				subject.reset_temp_dir
+    context 'temp dir is populated' do
+      before do
+        opts[:temp_directory] = '/tmp/promote_tests'
+        Dir.mkdir(opts[:temp_directory])
+        FileUtils.touch(File.join(opts[:temp_directory], 'file.txt'))
+      end
 
-				expect(Dir[File.join(subject.temp_directory, '*')]).to be_empty
-			end
-		end
+      it 'empties the temp directory' do
+        subject.reset_temp_dir
 
-		context "temp dir is populated" do
+        expect(Dir[File.join(subject.temp_directory, '*')]).to be_empty
+      end
+    end
 
-			it "creates the temp directory" do
-				subject.reset_temp_dir
+    context 'temp dir is populated' do
+      it 'creates the temp directory' do
+        subject.reset_temp_dir
 
-				expect(Dir).to exist(subject.temp_directory)
-			end
-		end
-	end
+        expect(Dir).to exist(subject.temp_directory)
+      end
+    end
+  end
 end

data/spec/unit/promote/cookbook_spec.rb

@@ -16,7 +16,7 @@ describe Promote::Cookbook do
 
   subject { Promote::Cookbook.new('cookbook_1', config) }
 
-  describe "dependencies" do
+  describe 'dependencies' do
     before {
       allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
       allow(fake_berks).to receive(:list).and_return([
@@ -26,7 +26,7 @@ describe Promote::Cookbook do
         ])
     }
 
-    it "returns dependencies from lockfile" do
+    it 'returns dependencies from lockfile' do
       expect(subject.dependencies.keys.count).to be 3
       expect(subject.dependencies['cookbook_2'].to_s).to eq '1.1.1'
       expect(subject.dependencies['cookbook_3'].to_s).to eq '2.2.2'
@@ -34,84 +34,84 @@ describe Promote::Cookbook do
     end
   end
 
-  describe "metadata_dependencies" do
+  describe 'metadata_dependencies' do
 
-    it "returns dependencies from metadata.rb" do
+    it 'returns dependencies from metadata.rb' do
       expect(subject.metadata_dependencies.keys.count).to be 1
       expect(subject.metadata_dependencies['cookbook_2'].to_s).to eq '= 1.1.1'
     end
   end
 
-  describe "path" do
+  describe 'path' do
 
-    it "returns the correct path of the cookbook" do
+    it 'returns the correct path of the cookbook' do
       expect(subject.path).to eq(File.join(cookbook_dir, 'cookbook_1'))
     end
   end
 
-  describe "version" do
+  describe 'version' do
 
-    it "reads the current version" do
+    it 'reads the current version' do
       expect(subject.version.to_s).to eq('1.0.0')
     end
 
-    it "writes changed version to metadata.rb" do
+    it 'writes changed version to metadata.rb' do
       subject.version = Semverse::Version.new('2.2.2')
       expect(Promote::Cookbook.new('cookbook_1', config).version.to_s).to eq '2.2.2'
     end
 
-    it "returns the new version after a version has changed" do
+    it 'returns the new version after a version has changed' do
       subject.version = Semverse::Version.new('2.2.2')
       expect(subject.version.to_s).to eq('2.2.2')
     end
   end
 
-  describe "stamp_commit" do
-    it "writes the sha1 to the end of the metadata file" do
+  describe 'stamp_commit' do
+    it 'writes the sha1 to the end of the metadata file' do
       subject.stamp_commit('commit_1')
       expect(subject.raw_metadata).to end_with "\n#sha1 'commit_1'"
     end
 
-    it "does not write the sha1 m ore than once" do
+    it 'does not write the sha1 m ore than once' do
       subject.stamp_commit('commit_1')
       subject.stamp_commit('commit_2')
-      expect(subject.raw_metadata).not_to include "commit_1"
+      expect(subject.raw_metadata).not_to include 'commit_1'
     end
   end
 
-  describe "sync_berksfile" do
+  describe 'sync_berksfile' do
     before {
       allow(File).to receive(:exist?).with(/Berksfile$/).and_return(true)
       allow(File).to receive(:exist?).with(/Berksfile.lock/).and_return(true)
     }
 
-    it "Installs berks dependencies" do
+    it 'Installs berks dependencies' do
       dummy = double('berksfile')
       expect(Berkshelf::Berksfile).to receive(:from_file).with(
-        File.join(subject.path, "Berksfile")).and_return(dummy)
+        File.join(subject.path, 'Berksfile')).and_return(dummy)
       expect(dummy).to receive(:install)
 
       subject.sync_berksfile
     end
 
-    it "Updates berks dependencies when asked to update" do
+    it 'Updates berks dependencies when asked to update' do
       dummy = double('berksfile')
       expect(Berkshelf::Berksfile).to receive(:from_file).with(
-        File.join(subject.path, "Berksfile")).and_return(dummy)
+        File.join(subject.path, 'Berksfile')).and_return(dummy)
       expect(dummy).to receive(:update)
 
       subject.sync_berksfile(true)
     end
 
-    context "update berksfile with no lock file" do
+    context 'update berksfile with no lock file' do
       before {
         allow(File).to receive(:exist?).with(/Berksfile.lock/).and_return(false)
       }
 
-      it "Installs berks dependencies instead of update" do
+      it 'Installs berks dependencies instead of update' do
         dummy = double('berksfile')
         expect(Berkshelf::Berksfile).to receive(:from_file).with(
-          File.join(subject.path, "Berksfile")).and_return(dummy)
+          File.join(subject.path, 'Berksfile')).and_return(dummy)
         expect(dummy).to receive(:install)
 
         subject.sync_berksfile(true)
@@ -119,7 +119,7 @@ describe Promote::Cookbook do
     end
   end
 
-  describe "dependencies_changed_after_update?" do
+  describe 'dependencies_changed_after_update?' do
     before {
       allow(File).to receive(:exist?).and_return(true)
       allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
@@ -130,12 +130,12 @@ describe Promote::Cookbook do
         ])
     }
 
-    it "performs a berks update" do
+    it 'performs a berks update' do
       expect(fake_berks).to receive(:update)
       subject.dependencies_changed_after_update?
     end
 
-    context "there is no change" do
+    context 'there is no change' do
 
       before {
         allow(fake_berks).to receive(:list).and_return(
@@ -152,12 +152,12 @@ describe Promote::Cookbook do
         )
       }
 
-      it "returns false" do
+      it 'returns false' do
         expect(subject.dependencies_changed_after_update?).to be false
       end
     end
 
-    context "there is a version change" do
+    context 'there is a version change' do
 
       before {
         allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
@@ -175,12 +175,12 @@ describe Promote::Cookbook do
         )
       }
 
-      it "returns true" do
+      it 'returns true' do
         expect(subject.dependencies_changed_after_update?).to be true
       end
     end
 
-    context "a dependency is removed" do
+    context 'a dependency is removed' do
 
       before {
         allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
@@ -197,12 +197,12 @@ describe Promote::Cookbook do
         )
       }
 
-      it "returns true" do
+      it 'returns true' do
         expect(subject.dependencies_changed_after_update?).to be true
       end
     end
 
-    context "a dependency is added" do
+    context 'a dependency is added' do
 
       before {
         allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
@@ -221,12 +221,12 @@ describe Promote::Cookbook do
         )
       }
 
-      it "returns true" do
+      it 'returns true' do
         expect(subject.dependencies_changed_after_update?).to be true
       end
     end
 
-    context "the cookbook under test has changed" do
+    context 'the cookbook under test has changed' do
 
       before {
         allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
@@ -242,7 +242,7 @@ describe Promote::Cookbook do
         )
       }
 
-      it "returns false" do
+      it 'returns false' do
         expect(subject.dependencies_changed_after_update?).to be false
       end
     end