clc-promote 0.9.8 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 494d4bd4962be5a954cba47372bec17606c31fef
-  data.tar.gz: 285a68574d0d47a08f4e1b36fb63fd96d8b1fd6d
+  metadata.gz: 375087f3ef3e0a22501b5fec3bb66fe4790269ea
+  data.tar.gz: 8df292375cfc83442f7b52c430a4e80c297fa8ef
 SHA512:
-  metadata.gz: 71932622b907a51e3471bc8588a3460edcbf2ea326aabbda6c2fff9a2ba94f03bff1288ae4f480d87573164231890f0050368fc36ce9d6cac8bb33a646e30f8a
-  data.tar.gz: 459d09edec7786f8d6f0c457407899f6ecbe4e9e61ad20383c7451ebb24a9755783c1623771fb912a436255a5485495b42de840e1f96506beb42cb60ff6b2a54
+  metadata.gz: a770c6d74a6a9b9df514990eb0b455182c6f9b32469ac947e2d207e78a7a8da93856b92dee3192bb1c0f888b7a88fd74cdb38016958b001d53f5b396c2075f90
+  data.tar.gz: 750dabb13120d715c5db7c12a8528e903097f3002987468d2f1daacfbc1d16e857b0379197d67041cb611e6528ea5f20109a1514e5931de63379107ed1adb5dd

data/clc-promote.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'clc-git', '~> 1.2', '>= 1.2.8'
   s.add_runtime_dependency 'berkshelf', '~> 3.2', '>= 3.2.3'
   s.add_runtime_dependency 'highline', '~> 1.6', '>= 1.6.21'
+  s.add_runtime_dependency 'chef-vault'
 
   s.add_development_dependency 'rspec', '~> 3.0', '>= 3.0.0'
   s.add_development_dependency 'rake', '~> 10.3', '>= 10.3.2'

data/lib/promote.rb

@@ -4,6 +4,8 @@ require 'promote/cookbook'
 require 'promote/environment_file'
 require 'promote/git_repo'
 require 'promote/node_finder'
+require 'promote/node_shell'
+require 'promote/password_vault'
 require 'promote/promoter'
 require 'promote/uploader'
 require 'promote/utils'

data/lib/promote/environment_file.rb

@@ -13,8 +13,12 @@ module Promote
       File.join(@config.environment_directory, "#{name}.json")
     end
 
+    def overrides
+        content['override_attributes'] || {}
+    end
+
     def cookbook_versions
-      content.has_key?('cookbook_versions') ? content['cookbook_versions'] : {}
+      content['cookbook_versions'] || {}
     end
 
     def write_cookbook_versions(versions)
@@ -28,11 +32,7 @@ module Promote
     private
 
     def content
-      @content ||= get_environment_content
-    end
-
-    def get_environment_content
-      JSON.parse(File.read(file_path))
+      @content ||= JSON.parse(File.read(file_path))
     end
   end
 end

data/lib/promote/node_shell.rb

@@ -0,0 +1,17 @@
+require 'promote/node_shell/base_shell'
+require 'promote/node_shell/ssh_shell'
+require 'promote/node_shell/winrm_shell'
+
+module Promote
+  module NodeShell
+    def self.for_node(node, config)
+      vault = PasswordVault.new(node, config)
+      case node.platform_family
+      when 'windows'
+        WinrmShell.new(node, vault)
+      else
+        SshShell.new(node, vault)
+      end
+    end
+  end
+end

data/lib/promote/node_shell/base_shell.rb

@@ -0,0 +1,20 @@
+module Promote
+  module NodeShell
+    class BaseShell
+      def initialize(node, vault)
+        @node = node
+        @vault = vault
+      end
+
+      attr_accessor :vault
+      attr_accessor :node
+
+      def converge?(ui = nil)
+        execute('chef-client', ui) == 0
+      end
+
+      def execute(command, ui = nil)
+      end
+    end
+  end
+end

data/lib/promote/node_shell/ssh_shell.rb

@@ -0,0 +1,40 @@
+module Promote
+  module NodeShell
+    class SshShell < BaseShell     
+      def session
+        @session ||= Net::SSH.start(
+          node.ipaddress,
+          'root',
+          password: vault.root_password
+        )
+      end
+
+      def execute(command, ui = nil)
+        exit_code = nil
+        out = []
+        session.open_channel do |channel|
+
+          channel.request_pty
+          channel.exec(command) do |_ch, _success|
+
+            channel.on_data do |_ch, data|
+              ui.info(data) if ui
+              out << data
+            end
+
+            channel.on_extended_data do |_ch, _type, data|
+              ui.info(data) if ui
+              out << data
+            end
+
+            channel.on_request("exit-status") do |_ch, data|
+              exit_code = data.read_long
+            end
+          end
+        end
+        session.loop
+        exit_code
+      end
+    end
+  end
+end

data/lib/promote/node_shell/winrm_shell.rb

@@ -0,0 +1,27 @@
+require 'winrm'
+
+module Promote
+  module NodeShell
+    class WinrmShell < BaseShell
+      def session
+        @session ||= begin
+          ::WinRM::WinRMWebService.new(
+            "http://#{node.ipaddress}:5985/wsman",
+            :plaintext,
+            user: 'administrator',
+            pass: vault.admin_password,
+            basic_auth_only: true
+          )
+        end
+      end
+
+      def execute(command, ui = nil)
+        response = session.run_cmd(command) do |stdout, stderr|
+          ui.info(stdout) if stdout && ui
+          ui.error(stderr) if stderr && ui
+        end
+        response[:exitcode]
+      end
+    end
+  end
+end

data/lib/promote/password_vault.rb

@@ -0,0 +1,38 @@
+require 'chef-vault'
+
+module Promote
+  class PasswordVault
+
+    include ChefServer
+
+    def initialize(node, config)
+      @node = node
+      @config = config
+    end
+
+    attr_accessor :config
+    attr_accessor :node
+
+    def root_password
+      raw['local_root_password']
+    end
+
+    def admin_password
+      raw['local_admin_password']
+    end
+
+    def raw
+      @raw ||= load_secrets
+    end
+
+    private
+
+    def load_secrets
+      bag = node['provisioner']['vault_bag']
+      item = "#{node['clc_library']['win_fqdn']}_domain"
+      with_chef_server(config) do
+        return ChefVault::Item.load(bag, item)
+      end
+    end
+  end
+end

data/lib/promote/promoter.rb

@@ -23,19 +23,30 @@ module Promote
       dest.write_cookbook_versions(source.cookbook_versions)
     end
 
-    def monitor_promotion(source_environment, destination_environments, probe_interval, force = false, max_wait = 3600, ui = nil)
+    def monitor_promotion(source_environment, destination_environments, number_to_test, converge_interval, force = false, ui = nil)
       ui.info "Waiting for #{source_environment} to finish" if ui
-      check_promotion(source_environment, probe_interval, max_wait, ui)
+      check_promotion(source_environment, converge_interval, ui)
 
-      uploader = Uploader.new(config)
+      test_environments = destination_environments[0, number_to_test]
+      final_environments = []
+      if destination_environments.count > number_to_test
+        final_environments = destination_environments[number_to_test..-1]
+      end
 
-      destination_environments.each do |env|
-        ui.confirm "Promote #{source_environment} to #{env}" if ui && !force
-        promote_to(source_environment, env, ui)
-        uploader.upload_environment(env, ui)
+      test_environments.each do |env|
+        promote_and_upload(source_environment, env, force, ui)
+        check_promotion(env, converge_interval, ui)
+      end
 
-        check_promotion(env, probe_interval, max_wait, ui)
+      final_environments.each do |env|
+        promote_and_upload(source_environment, env, force, ui)
       end
+      start = Time.now.to_i
+      final_environments.each do |env|
+        check_promotion(env, converge_interval, ui, start)
+      end
+
+      ui.info 'This promotion is complete' if ui
     end
 
     def stage_promotion(promote_environment, destination_config, ui)
@@ -86,6 +97,21 @@ module Promote
 
     private
 
+    def promote_and_upload(source, target, force, ui)
+      msg = "Promoting #{source} to #{target}..."
+      if ui
+        if force
+          ui.info msg
+        else
+          ui.confirm msg
+        end
+      end
+
+      uploader = Uploader.new(config)
+      promote_to(source, target, ui)
+      uploader.upload_environment(target, ui)
+    end
+
     def download_files(local_root, path, cookbook_version = nil)
       with_chef_server(config) do
         fs_config = Chef::ChefFS::Config.new(Chef::Config, cwd = Dir.pwd, {:cookbook_version => cookbook_version})
@@ -102,32 +128,28 @@ module Promote
       end
     end
 
-    def check_promotion(environment_to_check, probe_interval, max_wait, ui)
-      start = Time.now.to_i
-      finder = NodeFinder.new("chef_environment:#{environment_to_check}", config)
-      unconverged = nil
-      converged = []
-      until Time.now.to_i - start > max_wait
-        result = finder.search
-        unconverged = []
-        result.each do |node|
+    def check_promotion(environment_to_check, converge_interval, ui, start = Time.now.to_i)
+      vault = PasswordVault.new(environment_to_check, config)
+      query = "chef_environment:#{environment_to_check}"
+
+      %w(windows ubuntu).each do |platform|
+        nodes = NodeFinder.new("#{query} AND platform:#{platform}", config).search
+
+        nodes.each do |node|
           next if node.name == config.node_name
-          if node['ohai_time'].to_i < start
-            unconverged << node
-          elsif converged.grep(/#{node.name}/).empty?
-            converged << node.name
-            ui.info "#{node.name} has converged" if ui
+          next if node.name.include?('PROVISIONER')
+
+          fresh_node = NodeFinder.new("name:#{node.name}", config).search.first
+          if fresh_node['ohai_time'].to_i > start
+            ui.info "#{node.name} already converged" if ui
+          else
+            ui.info "converging #{node.name}" if ui
+            unless NodeShell.for_node(node, config).converge?(ui)
+              raise "Stopping promotion in #{environment_to_check}! Node (#{node.name}) failed to converge."
+            end
+            sleep converge_interval
           end
         end
-        break if unconverged.count == 0
-
-        ui.stdout.print "." if ui
-
-        sleep probe_interval
-      end
-
-      if unconverged.count > 0
-        raise "Stopping promotion! Nodes (#{unconverged}) are not converging in #{environment_to_check}"
       end
     end
   end

data/lib/promote/rake_tasks.rb

@@ -109,10 +109,17 @@ module Promote
     def define_promote_environments
       namespace "Promote" do
         desc "Promote a list of environments from another"
-        task "promote_environments", :source_environment, :destination_environments, :force do |task, args|
+        task "promote_environments", :source_environment, :destination_environments, :number_to_test, :force do |task, args|
           puts "Promoting constraints in #{args.source_environment} to #{args.destination_environments}"
           ui = Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
-          @promoter.monitor_promotion(args.source_environment, args.destination_environments.split(' '), 5, args.force, 3600, ui)
+          @promoter.monitor_promotion(
+            args.source_environment,
+            args.destination_environments.split(' '),
+            args.number_to_test,
+            5,
+            args.force,
+            ui
+          )
         end
       end
     end

data/lib/promote/version.rb

@@ -1,3 +1,3 @@
 module Promote
-  VERSION = '0.9.8'
+  VERSION = '0.10.0'
 end

data/spec/unit/promote/cookbook_spec.rb

@@ -1,30 +1,43 @@
 require 'promote'
 
-describe Promote::Cookbook do 
-  let(:cookbook_dir) {'/tmp/promote_test_cookbooks/stubs'}
-  let(:config) { Promote::Config.new({ 
-    :cookbook_directory => cookbook_dir}) 
-  }
-  let(:fake_berks) { double('berksfile', :list => nil, :install => nil, :update => nil) }
-
-  before(:all) {
+describe Promote::Cookbook do
+  let(:cookbook_dir) { '/tmp/promote_test_cookbooks/stubs' }
+  let(:config) { Promote::Config.new(cookbook_directory: cookbook_dir) }
+  let(:fake_berks) { double('berksfile', list: nil, install: nil, update: nil) }
+
+  before(:all) do
     cb_dir = '/tmp/promote_test_cookbooks'
     FileUtils.rm_rf(cb_dir) if Dir.exist?(cb_dir)
     Dir.mkdir(cb_dir)
-    FileUtils.cp_r(File.join(File.dirname(File.dirname(__FILE__)), 'stubs'), cb_dir)
-  }
+    FileUtils.cp_r(
+      File.join(File.dirname(File.dirname(__FILE__)), 'stubs'), cb_dir)
+  end
 
   subject { Promote::Cookbook.new('cookbook_1', config) }
 
   describe 'dependencies' do
-    before {
+    before do
       allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
-      allow(fake_berks).to receive(:list).and_return([
-        double('Dependency', :name => 'cookbook_2', :locked_version => Semverse::Version.new('1.1.1')),
-        double('Dependency', :name => 'cookbook_3', :locked_version => Semverse::Version.new('2.2.2')),
-        double('Dependency', :name => 'cookbook_4', :locked_version => Semverse::Version.new('3.3.3'))
-        ])
-    }
+      allow(fake_berks).to receive(:list).and_return(
+        [
+          double(
+            'Dependency',
+            name: 'cookbook_2',
+            locked_version: Semverse::Version.new('1.1.1')
+          ),
+          double(
+            'Dependency',
+            name: 'cookbook_3',
+            locked_version: Semverse::Version.new('2.2.2')
+          ),
+          double(
+            'Dependency',
+            name: 'cookbook_4',
+            locked_version: Semverse::Version.new('3.3.3')
+          )
+        ]
+      )
+    end
 
     it 'returns dependencies from lockfile' do
       expect(subject.dependencies.keys.count).to be 3
@@ -35,7 +48,6 @@ describe Promote::Cookbook do
   end
 
   describe 'metadata_dependencies' 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'
@@ -43,21 +55,20 @@ describe Promote::Cookbook do
   end
 
   describe 'path' 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
-
     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
       subject.version = Semverse::Version.new('2.2.2')
-      expect(Promote::Cookbook.new('cookbook_1', config).version.to_s).to eq '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
@@ -80,10 +91,10 @@ describe Promote::Cookbook do
   end
 
   describe 'sync_berksfile' do
-    before {
+    before do
       allow(File).to receive(:exist?).with(/Berksfile$/).and_return(true)
       allow(File).to receive(:exist?).with(/Berksfile.lock/).and_return(true)
-    }
+    end
 
     it 'Installs berks dependencies' do
       dummy = double('berksfile')
@@ -104,9 +115,9 @@ describe Promote::Cookbook do
     end
 
     context 'update berksfile with no lock file' do
-      before {
+      before do
         allow(File).to receive(:exist?).with(/Berksfile.lock/).and_return(false)
-      }
+      end
 
       it 'Installs berks dependencies instead of update' do
         dummy = double('berksfile')
@@ -120,15 +131,27 @@ describe Promote::Cookbook do
   end
 
   describe 'dependencies_changed_after_update?' do
-    before {
+    before do
       allow(File).to receive(:exist?).and_return(true)
       allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
       allow(fake_berks).to receive(:list).and_return([
-        double('Dependency', :name => 'cookbook_2', :locked_version => Semverse::Version.new('1.1.1')),
-        double('Dependency', :name => 'cookbook_3', :locked_version => Semverse::Version.new('2.2.2')),
-        double('Dependency', :name => 'cookbook_4', :locked_version => Semverse::Version.new('3.3.3'))
-        ])
-    }
+        double(
+          'Dependency',
+          name: 'cookbook_2',
+          locked_version: Semverse::Version.new('1.1.1')
+        ),
+        double(
+          'Dependency',
+          name: 'cookbook_3',
+          locked_version: Semverse::Version.new('2.2.2')
+        ),
+        double(
+          'Dependency',
+          name: 'cookbook_4',
+          locked_version: Semverse::Version.new('3.3.3')
+        )
+      ])
+    end
 
     it 'performs a berks update' do
       expect(fake_berks).to receive(:update)
@@ -136,21 +159,44 @@ describe Promote::Cookbook do
     end
 
     context 'there is no change' do
-
-      before {
+      before do
         allow(fake_berks).to receive(:list).and_return(
           [
-            double('Dependency', :name => 'cookbook_2', :locked_version => Semverse::Version.new('1.1.1')),
-            double('Dependency', :name => 'cookbook_3', :locked_version => Semverse::Version.new('2.2.2')),
-            double('Dependency', :name => 'cookbook_4', :locked_version => Semverse::Version.new('3.3.3'))
+            double(
+              'Dependency',
+              name: 'cookbook_2',
+              locked_version: Semverse::Version.new('1.1.1')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_3',
+              locked_version: Semverse::Version.new('2.2.2')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_4',
+              locked_version: Semverse::Version.new('3.3.3')
+            )
           ],
           [
-            double('Dependency', :name => 'cookbook_2', :locked_version => Semverse::Version.new('1.1.1')),
-            double('Dependency', :name => 'cookbook_3', :locked_version => Semverse::Version.new('2.2.2')),
-            double('Dependency', :name => 'cookbook_4', :locked_version => Semverse::Version.new('3.3.3'))
+            double(
+              'Dependency',
+              name: 'cookbook_2',
+              locked_version: Semverse::Version.new('1.1.1')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_3',
+              locked_version: Semverse::Version.new('2.2.2')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_4',
+              locked_version: Semverse::Version.new('3.3.3')
+            )
           ]
         )
-      }
+      end
 
       it 'returns false' do
         expect(subject.dependencies_changed_after_update?).to be false
@@ -158,22 +204,44 @@ describe Promote::Cookbook do
     end
 
     context 'there is a version change' do
-
-      before {
-        allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
+      before do
         allow(fake_berks).to receive(:list).and_return(
           [
-            double('Dependency', :name => 'cookbook_2', :locked_version => Semverse::Version.new('1.1.1')),
-            double('Dependency', :name => 'cookbook_3', :locked_version => Semverse::Version.new('2.2.2')),
-            double('Dependency', :name => 'cookbook_4', :locked_version => Semverse::Version.new('3.3.3'))
+            double(
+              'Dependency',
+              name: 'cookbook_2',
+              locked_version: Semverse::Version.new('1.1.1')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_3',
+              locked_version: Semverse::Version.new('2.2.2')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_4',
+              locked_version: Semverse::Version.new('3.3.3')
+            )
           ],
           [
-            double('Dependency', :name => 'cookbook_2', :locked_version => Semverse::Version.new('1.1.1')),
-            double('Dependency', :name => 'cookbook_3', :locked_version => Semverse::Version.new('2.2.3')),
-            double('Dependency', :name => 'cookbook_4', :locked_version => Semverse::Version.new('3.3.3'))
+            double(
+              'Dependency',
+              name: 'cookbook_2',
+              locked_version: Semverse::Version.new('1.1.1')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_3',
+              locked_version: Semverse::Version.new('2.2.3')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_4',
+              locked_version: Semverse::Version.new('3.3.3')
+            )
           ]
         )
-      }
+      end
 
       it 'returns true' do
         expect(subject.dependencies_changed_after_update?).to be true
@@ -181,21 +249,39 @@ describe Promote::Cookbook do
     end
 
     context 'a dependency is removed' do
-
-      before {
-        allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
+      before do
         allow(fake_berks).to receive(:list).and_return(
           [
-            double('Dependency', :name => 'cookbook_2', :locked_version => Semverse::Version.new('1.1.1')),
-            double('Dependency', :name => 'cookbook_3', :locked_version => Semverse::Version.new('2.2.2')),
-            double('Dependency', :name => 'cookbook_4', :locked_version => Semverse::Version.new('3.3.3'))
+            double(
+              'Dependency',
+              name: 'cookbook_2',
+              locked_version: Semverse::Version.new('1.1.1')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_3',
+              locked_version: Semverse::Version.new('2.2.2')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_4',
+              locked_version: Semverse::Version.new('3.3.3')
+            )
           ],
           [
-            double('Dependency', :name => 'cookbook_2', :locked_version => Semverse::Version.new('1.1.1')),
-            double('Dependency', :name => 'cookbook_4', :locked_version => Semverse::Version.new('3.3.3'))
+            double(
+              'Dependency',
+              name: 'cookbook_2',
+              locked_version: Semverse::Version.new('1.1.1')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_4',
+              locked_version: Semverse::Version.new('3.3.3')
+            )
           ]
         )
-      }
+      end
 
       it 'returns true' do
         expect(subject.dependencies_changed_after_update?).to be true
@@ -203,23 +289,49 @@ describe Promote::Cookbook do
     end
 
     context 'a dependency is added' do
-
-      before {
-        allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
+      before do
         allow(fake_berks).to receive(:list).and_return(
           [
-            double('Dependency', :name => 'cookbook_2', :locked_version => Semverse::Version.new('1.1.1')),
-            double('Dependency', :name => 'cookbook_3', :locked_version => Semverse::Version.new('2.2.2')),
-            double('Dependency', :name => 'cookbook_4', :locked_version => Semverse::Version.new('3.3.3'))
+            double(
+              'Dependency',
+              name: 'cookbook_2',
+              locked_version: Semverse::Version.new('1.1.1')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_3',
+              locked_version: Semverse::Version.new('2.2.2')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_4',
+              locked_version: Semverse::Version.new('3.3.3')
+            )
           ],
           [
-            double('Dependency', :name => 'cookbook_2', :locked_version => Semverse::Version.new('1.1.1')),
-            double('Dependency', :name => 'cookbook_3', :locked_version => Semverse::Version.new('2.2.2')),
-            double('Dependency', :name => 'cookbook_4', :locked_version => Semverse::Version.new('3.3.3')),
-            double('Dependency', :name => 'cookbook_5', :locked_version => Semverse::Version.new('3.3.3'))
+            double(
+              'Dependency',
+              name: 'cookbook_2',
+              locked_version: Semverse::Version.new('1.1.1')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_3',
+              locked_version: Semverse::Version.new('2.2.2')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_4',
+              locked_version: Semverse::Version.new('3.3.3')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_5',
+              locked_version: Semverse::Version.new('3.3.3')
+            )
           ]
         )
-      }
+      end
 
       it 'returns true' do
         expect(subject.dependencies_changed_after_update?).to be true
@@ -227,24 +339,38 @@ describe Promote::Cookbook do
     end
 
     context 'the cookbook under test has changed' do
-
-      before {
-        allow(Berkshelf::Berksfile).to receive(:from_file).and_return(fake_berks)
+      before do
         allow(fake_berks).to receive(:list).and_return(
           [
-            double('Dependency', :name => 'cookbook_1', :locked_version => Semverse::Version.new('1.1.1')),
-            double('Dependency', :name => 'cookbook_3', :locked_version => Semverse::Version.new('2.2.2')),
+            double(
+              'Dependency',
+              name: 'cookbook_1',
+              locked_version: Semverse::Version.new('1.1.1')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_3',
+              locked_version: Semverse::Version.new('2.2.2')
+            )
           ],
           [
-            double('Dependency', :name => 'cookbook_1', :locked_version => Semverse::Version.new('1.1.2')),
-            double('Dependency', :name => 'cookbook_3', :locked_version => Semverse::Version.new('2.2.2')),
+            double(
+              'Dependency',
+              name: 'cookbook_1',
+              locked_version: Semverse::Version.new('1.1.2')
+            ),
+            double(
+              'Dependency',
+              name: 'cookbook_3',
+              locked_version: Semverse::Version.new('2.2.2')
+            )
           ]
         )
-      }
+      end
 
       it 'returns false' do
         expect(subject.dependencies_changed_after_update?).to be false
       end
     end
   end
-end
+end