knife-solo_data_bag 1.1.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cf49bac07e42c95338783f5538307c3041fb42c3
+  data.tar.gz: 93ad9e80f4d7b1f42a59a7f130a04beb022cc8dd
+SHA512:
+  metadata.gz: 58029e99bc35b17c56d4b9d5e323f4a33108aaff0d39b085e9b6cc024402950bb8e27cfeccd476ebd6c2af9fa8278327999646d987a368604a4aba59aa40a997
+  data.tar.gz: 2c1f8b1273fb493d825b986ac5e658f2b18fc7eebe3310ce8f5070099aa7fab71b9e1174e66b0bfdf4e0dd44b85ea0c98a0548168f52ee45b372706c873f86d8

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+/gemfiles/*.lock
 Gemfile.lock
 Guardfile
 InstalledFiles

data/.travis.yml

@@ -1,12 +1,11 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.2.2
+  - 2.3.0
+
+before_install:
+  - gem install bundler
 
 gemfile:
-  - ./gemfiles/Gemfile.chef.11.4.4
-  - ./gemfiles/Gemfile.chef.11.6.2
-  - ./gemfiles/Gemfile.chef.11.8.0
-  - ./gemfiles/Gemfile.chef.11.8.2
-  - ./gemfiles/Gemfile.chef.11.10.0
-  - ./gemfiles/Gemfile.chef.11.10.2
-  - ./gemfiles/Gemfile.chef.11.10.4
+  - ./gemfiles/Gemfile.chef.11.18.12
+  - ./gemfiles/Gemfile.chef.12.16.42

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## head
 
+# 2.0.0 (10/12/2016)
+
+* Deprecate unsupported Ruby versions,
+* Support supported Ruby versions (2.2 and 2.3),
+* Update RSpec to 3.x,
+* Update other gems.
+
 # 1.1.0 (04/10/2014)
 
 * add ability to correct incorrect text when editing a data bag

data/README.md

@@ -4,8 +4,12 @@ A knife plugin to make working with data bags easier in a chef solo environment.
 If you are looking for a full featured chef solo management solution, you may
 want to check out [knife solo](https://github.com/matschaffer/knife-solo).
 
-*NOTE: Starting with 1.0.0, knife solo data bag only supports Chef versions >= 11.4.0.
-If you need support for an earlier version of chef, use a knife solo data bag version < 1.0.0.*
+## Deprecation Notices
+
+* Versions >= 2 only support Ruby versions 2.2 and above.
+  If you need o use an earlier Ruby version, use `knife-solo_data_bag` < 2.0.0.
+* Starting with 1.0.0, knife solo data bag only supports Chef versions >= 11.4.0.
+  If you need support for an earlier version of chef, use a knife solo data bag version < 1.0.0.
 
 ## Build Status
 ![Build Status](https://secure.travis-ci.org/thbishop/knife-solo_data_bag.png)
@@ -88,11 +92,13 @@ setting in knife.rb.
 This plugin has been tested on the following:
 
 Chef:
-* > 11.4.0
+* ~> 11.8
+* ~> 12.16
 
 Ruby:
-* 1.9.2
-* 1.9.3
+* 2.1.8
+* 2.2.2
+* 2.3.0
 
 OS:
 * OSX

data/Rakefile

@@ -7,7 +7,7 @@ task :default => [:spec]
 
 desc 'Run specs'
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = %w(-fs --color)
+  t.rspec_opts = %w(--format documentation --color)
 end
 
 begin

data/gemfiles/{Gemfile.chef.11.10.0 → Gemfile.chef.11.18.12}

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
-gem 'chef', '11.10.0'
+gem 'chef', '11.18.12'
 
 gemspec :path => "../"

data/gemfiles/{Gemfile.chef.11.10.2 → Gemfile.chef.12.16.42}

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
-gem 'chef', '11.10.2'
+gem 'chef', '12.16.42'
 
 gemspec :path => "../"

data/knife-solo_data_bag.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Knife::SoloDataBag::VERSION
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 2.13.0'
-  gem.add_development_dependency 'fakefs', '~> 0.4.0'
+  gem.add_development_dependency 'rspec', '>= 3.0'
+  gem.add_development_dependency 'fakefs'
 end

data/lib/chef/knife/solo_data_bag_edit.rb

@@ -43,7 +43,8 @@ class Chef
           begin
             updated_content = Chef::JSONCompat.from_json(unparsed)
             break
-          rescue Yajl::ParseError => e
+          rescue => e
+            raise e if !is_invalid_json_error?(e)
             loop do
               ui.stdout.puts e.to_s
               question = "Do you want to keep editing (Y/N)? If you choose 'N', all changes will be lost"
@@ -71,7 +72,8 @@ class Chef
         tf.puts text
         tf.close
 
-        raise "Please set EDITOR environment variable" unless Kernel.system("#{config[:editor]} #{tf.path}")
+        exit_status = Kernel.system("#{config[:editor]} #{tf.path}")
+        raise "Please set EDITOR environment variable" if !exit_status
 
         output = File.read(tf.path)
         tf.unlink
@@ -105,6 +107,10 @@ class Chef
         end
       end
 
+      def is_invalid_json_error?(exception)
+        exception.class.to_s.end_with?("::ParseError")
+      end
+
     end
 
   end

data/lib/knife-solo_data_bag/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module SoloDataBag
-    VERSION = '1.1.0'
+    VERSION = '2.0.0'
   end
 end

data/spec/contexts/bag_name_not_provided.rb

@@ -1,11 +1,11 @@
 shared_context 'bag_name_not_provided' do
   context 'when a name is not supplied' do
     it 'should exit with an error message' do
-      lambda {
+      expect do
         @knife.run
-      }.should raise_error SystemExit
-      @stdout.string.should match /usage/i
-      @stderr.string.should match /name for the data bag/
+        end.to raise_error(SystemExit)
+      expect(@stdout.string).to match(/usage/i)
+      expect(@stderr.string).to match(/name for the data bag/)
     end
   end
 end

data/spec/contexts/bag_path_is_not_valid.rb

@@ -1,15 +1,21 @@
 shared_context 'bag_path_is_not_valid' do |args|
   context 'when the data bag path is not valid' do
     before do
-      File.stub(:directory?).and_return(false)
+      allow(File).
+        to receive(:directory?).
+           and_call_original
+      allow(File).
+        to receive(:directory?).
+           with(/data_bags/).
+           and_return(false)
       @knife.name_args = ['foo']
       @knife.name_args.concat Array(args)
     end
 
     it 'should raise an invalid data bag path exception' do
-      lambda {
+      expect do
         @knife.run
-      }.should raise_error Chef::Exceptions::InvalidDataBagPath
+      end.to raise_error(Chef::Exceptions::InvalidDataBagPath)
     end
   end
 end

data/spec/contexts/secret_string_and_secret_file_are_both_provided.rb

@@ -1,19 +1,25 @@
 shared_context 'secret_string_and_secret_file_are_both_provided' do |args|
   context 'when specifying -s and --secret-file' do
     before do
+      allow(File).
+        to receive(:directory?).
+           with(/data_bags/).
+           and_return(true)
+      allow(File).
+        to receive(:directory?).
+           and_call_original
       @knife.name_args = ['foo']
       @knife.name_args.concat Array(args)
       @knife.config[:secret] = 'foobar'
       @knife.config[:secret_file] = 'secret.txt'
-      File.stub(:directory?).and_return(true)
     end
 
     it 'should exit with an error message' do
-      lambda {
+      expect do
         @knife.run
-      }.should raise_error SystemExit
-      @stdout.string.should match /usage/i
-      @stderr.string.should match /either --secret or --secret-file/
+      end.to raise_error(SystemExit)
+      expect(@stdout.string).to match(/usage/i)
+      expect(@stderr.string).to match(/either --secret or --secret-file/)
     end
 
   end

data/spec/contexts/stubbed_out_stdout_and_stderr.rb

@@ -2,7 +2,7 @@ shared_context 'stubbed_out_stdout_and_stderr' do
   before do
     @stdout = StringIO.new
     @stderr = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
-    @knife.ui.stub!(:stderr).and_return(@stderr)
+    allow(@knife.ui).to receive(:stdout) { @stdout }
+    allow(@knife.ui).to receive(:stderr) { @stderr }
   end
 end

data/spec/unit/solo_data_bag_create_spec.rb

@@ -8,9 +8,10 @@ describe Chef::Knife::SoloDataBagCreate do
   include_context 'stubbed_out_stdout_and_stderr'
 
   describe 'run' do
+    let(:secret_path) { '/var/chef/secret.txt' }
+
     include_context 'bag_name_not_provided'
     include_context 'bag_path_is_not_valid'
-    include_context 'secret_string_and_secret_file_are_both_provided'
 
     context 'with valid arguments' do
       before do
@@ -21,8 +22,13 @@ describe Chef::Knife::SoloDataBagCreate do
 
         FakeFS.activate!
         FileUtils.mkdir_p @bags_path
+        allow(Chef::EncryptedDataBagItem).to receive(:load_secret).
+                                             with(secret_path).
+                                             and_return('psst')
       end
 
+      include_context 'secret_string_and_secret_file_are_both_provided'
+
       after do
         FakeFS.deactivate!
         FakeFS::FileSystem.clear
@@ -31,8 +37,8 @@ describe Chef::Knife::SoloDataBagCreate do
       context 'if an item is not specified' do
         it 'should create the data bag' do
           @knife.run
-          File.directory?(@bags_path).should be_true
-          File.directory?(@bag_path).should be_true
+          expect(File.directory?(@bags_path)).to be_truthy
+          expect(File.directory?(@bag_path)).to be_truthy
         end
       end
 
@@ -41,17 +47,18 @@ describe Chef::Knife::SoloDataBagCreate do
           @knife.name_args << 'bar'
           @input_data = {'id' => 'foo', 'key_1' => 'value_1', 'key_2' => 'value_2'}
           @item_path  = "#{@bag_path}/bar.json"
-          @knife.stub(:create_object).and_yield(@input_data).and_return(nil)
+          allow(@knife).to receive(:create_object).
+                           and_yield(@input_data).and_return(nil)
         end
 
         it 'should create the data bag item' do
           @knife.run
-          JSON.parse(File.read(@item_path)).should == @input_data
+          expect(JSON.parse(File.read(@item_path))).to eq(@input_data)
         end
 
         it 'should write pretty json' do
           @knife.run
-          File.read(@item_path).should == JSON.pretty_generate(@input_data)
+          expect(File.read(@item_path)).to eq(JSON.pretty_generate(@input_data))
       end
 
         context 'with --data-bag-path' do
@@ -64,7 +71,7 @@ describe Chef::Knife::SoloDataBagCreate do
 
           it 'uses the data bag path from the override' do
             @knife.run
-            File.directory?(@override_bag_path).should be_true
+            expect(File.directory?(@override_bag_path)).to be_truthy
           end
         end
 
@@ -78,39 +85,32 @@ describe Chef::Knife::SoloDataBagCreate do
             @knife.run
             content = JSON.parse(File.read(@item_path))
             @input_data.keys.reject{|i| i == 'id'}.each do |k|
-              content.should have_key k
-              content[k].should_not == @input_data[k]
+              expect(content).to have_key(k)
+              expect(content[k]).not_to eq(@input_data[k])
             end
           end
         end
 
         context 'when encrypting with --secret-file' do
+
           before do
             @knife.name_args            << 'bar'
-            @secret_path                = '/var/chef/secret.txt'
-            @knife.config[:secret_file] = @secret_path
-            Chef::EncryptedDataBagItem.should_receive(:load_secret).
-                                       with(@secret_path).
-                                       and_return('psst')
+            @knife.config[:secret_file] = secret_path
           end
 
           it 'should create the encrypted data bag item' do
             @knife.run
             content = JSON.parse(File.read(@item_path))
             @input_data.keys.reject{|i| i == 'id'}.each do |k|
-              content.should have_key k
-              content[k].should_not == @input_data[k]
+              expect(content).to have_key(k)
+              expect(content[k]).to_not eq(@input_data[k])
             end
           end
         end
 
         context 'when encrypting with secret set in knife config' do
           before do
-            @secret_path                             = '/var/chef/secret.txt'
-            Chef::Config[:encrypted_data_bag_secret] = @secret_path
-            Chef::EncryptedDataBagItem.should_receive(:load_secret).
-                                       with(@secret_path).
-                                       and_return('psst')
+            Chef::Config[:encrypted_data_bag_secret] = secret_path
           end
 
           after { Chef::Config[:encrypted_data_bag_secret] = nil }
@@ -119,8 +119,8 @@ describe Chef::Knife::SoloDataBagCreate do
             @knife.run
             content = JSON.parse(File.read(@item_path))
             @input_data.keys.reject{|i| i == 'id'}.each do |k|
-              content.should have_key k
-              content[k].should_not == @input_data[k]
+              expect(content).to have_key(k)
+              expect(content[k]).to_not eq(@input_data[k])
             end
           end
 
@@ -138,7 +138,7 @@ describe Chef::Knife::SoloDataBagCreate do
 
         it 'should create the data bag item' do
           @knife.run
-          JSON.parse(File.read(@item_path)).should == @input_data
+          expect(JSON.parse(File.read(@item_path))).to eq(@input_data)
         end
 
         context 'when encrypting with -s or --secret' do
@@ -151,8 +151,8 @@ describe Chef::Knife::SoloDataBagCreate do
             @knife.run
             content = JSON.parse(File.read(@item_path))
             @input_data.keys.reject{|i| i == 'id'}.each do |k|
-              content.should have_key k
-              content[k].should_not == @input_data[k]
+              expect(content).to have_key(k)
+              expect(content[k]).to_not eq(@input_data[k])
             end
           end
         end
@@ -160,30 +160,22 @@ describe Chef::Knife::SoloDataBagCreate do
         context 'when encrypting with --secret-file' do
           before do
             @knife.name_args            << 'bar'
-            @secret_path                = '/var/chef/secret.txt'
-            @knife.config[:secret_file] = @secret_path
-            Chef::EncryptedDataBagItem.should_receive(:load_secret).
-                                       with(@secret_path).
-                                       and_return('psst')
+            @knife.config[:secret_file] = secret_path
           end
 
           it 'should create the encrypted data bag item' do
             @knife.run
             content = JSON.parse(File.read(@item_path))
             @input_data.keys.reject{|i| i == 'id'}.each do |k|
-              content.should have_key k
-              content[k].should_not == @input_data[k]
+              expect(content).to have_key(k)
+              expect(content[k]).to_not eq(@input_data[k])
             end
           end
         end
 
         context 'when encrypting with secret set in knife config' do
           before do
-            @secret_path                             = '/var/chef/secret.txt'
-            Chef::Config[:encrypted_data_bag_secret] = @secret_path
-            Chef::EncryptedDataBagItem.should_receive(:load_secret).
-                                       with(@secret_path).
-                                       and_return('psst')
+            Chef::Config[:encrypted_data_bag_secret] = secret_path
           end
 
           after { Chef::Config[:encrypted_data_bag_secret] = nil }
@@ -192,8 +184,8 @@ describe Chef::Knife::SoloDataBagCreate do
             @knife.run
             content = JSON.parse(File.read(@item_path))
             @input_data.keys.reject{|i| i == 'id'}.each do |k|
-              content.should have_key k
-              content[k].should_not == @input_data[k]
+              expect(content).to have_key(k)
+              expect(content[k]).to_not eq(@input_data[k])
             end
           end
 
@@ -212,7 +204,7 @@ describe Chef::Knife::SoloDataBagCreate do
 
         it 'creates the data bag item' do
           @knife.run
-          JSON.parse(File.read(@item_path)).should == @input_data
+          expect(JSON.parse(File.read(@item_path))).to eq(@input_data)
         end
       end
 

data/spec/unit/solo_data_bag_edit_spec.rb

@@ -1,13 +1,26 @@
 require 'spec_helper'
 
-describe Chef::Knife::SoloDataBagEdit do
+RSpec.describe Chef::Knife::SoloDataBagEdit do
   before do
-    @knife  = subject
+    @knife = subject
   end
 
   include_context 'stubbed_out_stdout_and_stderr'
 
   describe 'run' do
+    let(:bags_path) { '/var/chef/data_bags' }
+    let(:bag_path) { "#{bags_path}/bag_1" }
+
+    before do
+      FakeFS.activate!
+      FileUtils.mkdir_p bag_path
+    end
+
+    after do
+      FakeFS.deactivate!
+      FakeFS::FileSystem.clear
+    end
+
     include_context 'bag_name_not_provided'
     include_context 'bag_path_is_not_valid', ['foo']
     include_context 'secret_string_and_secret_file_are_both_provided', ['bar']
@@ -18,11 +31,11 @@ describe Chef::Knife::SoloDataBagEdit do
       end
 
       it 'should exit with an error message' do
-        lambda {
+        expect do
           @knife.run
-        }.should raise_error SystemExit
-        @stdout.string.should match(/usage/i)
-        @stderr.string.should match(/name for the item/)
+        end.to raise_error(SystemExit)
+        expect(@stdout.string).to match(/usage/i)
+        expect(@stderr.string).to match(/name for the item/)
       end
     end
 
@@ -38,11 +51,11 @@ describe Chef::Knife::SoloDataBagEdit do
         )
       end
       let(:tempfile_name) { '/tmp/foo' }
+      let(:editor) { 'vimacs' }
+      let(:edit_command) { "#{editor} #{tempfile_name}" }
 
       before do
-        @bags_path        = '/var/chef/data_bags'
-        @bag_path         = "#{@bags_path}/bag_1"
-        @item_path        = "#{@bag_path}/foo.json"
+        @item_path        = "#{bag_path}/foo.json"
         @knife.name_args  = ['bag_1', 'foo']
         @orig_data        = {'id' => 'foo', 'who' => 'bob'}
         @updated_data     = {'id' => 'foo', 'who' => 'sue'}
@@ -50,33 +63,32 @@ describe Chef::Knife::SoloDataBagEdit do
         @bag_item_foo.data_bag 'bag_1'
         @updated_bag_item = Chef::DataBagItem.from_hash @updated_data
         @updated_bag_item.data_bag 'bag_1'
-
-        FakeFS.activate!
-        FileUtils.mkdir_p @bag_path
-
-        Chef::DataBagItem.should_receive(:load).with('bag_1', 'foo').
-                                                and_return(@bag_item_foo)
-        Tempfile.stub(:new).and_return(tf)
-        Kernel.stub(:system => true)
-        File.stub(:read).and_call_original
-        File.stub(:read).with(tempfile_name).and_return(@updated_data.to_json)
-        Chef::Config[:data_bag_path] = @bags_path
-      end
-
-      after do
-        FakeFS.deactivate!
-        FakeFS::FileSystem.clear
+        @knife.config[:editor] = 'vimacs'
+
+        allow(Chef::DataBagItem).to receive(:load).
+                                    with('bag_1', 'foo').
+                                    and_return(@bag_item_foo)
+        allow(Tempfile).to receive(:new).
+                           with(['knife-edit', '.json']).
+                           and_return(tf)
+        allow(Kernel).to receive(:system).and_call_original
+        allow(Kernel).to receive(:system).with(edit_command) { true }
+        allow(File).to receive(:read).and_call_original
+        allow(File).to receive(:read).
+                       with(tempfile_name).
+                       and_return(@updated_data.to_json)
+        Chef::Config[:data_bag_path] = bags_path
       end
 
       it 'should edit the data bag item' do
         @knife.run
-        JSON.parse(File.read(@item_path)).should == @updated_data
+        expect(JSON.parse(File.read(@item_path))).to eq(@updated_data)
       end
 
       it 'should write pretty json' do
         @knife.run
         data = JSON.pretty_generate(:id => 'foo', :who => 'sue')
-        File.read(@item_path).should == data
+        expect(File.read(@item_path)).to eq(data)
       end
 
       context 'with --data-bag-path' do
@@ -91,23 +103,24 @@ describe Chef::Knife::SoloDataBagEdit do
         it 'uses the data bag path from the override' do
           @knife.run
           data = JSON.parse(File.read(@override_item_path))
-          data.should == @updated_data
+          expect(data).to eq(@updated_data)
         end
       end
 
       context 'when encrypting with -s or --secret' do
         before do
           @knife.config[:secret] = 'secret_key'
-          Chef::EncryptedDataBagItem.should_receive(:new).
-                                     with(@bag_item_foo.raw_data, 'secret_key').
-                                     and_return(@updated_data)
+          allow(Chef::EncryptedDataBagItem).
+            to receive(:new).
+               with(@bag_item_foo.raw_data, 'secret_key').
+               and_return(@updated_data)
         end
 
         it 'should edit the encrypted data bag item' do
           @knife.run
           content = JSON.parse(File.read(@item_path))
-          content['who'].should_not == @orig_data['who']
-          content['who'].should_not be_nil
+          expect(content['who']).not_to eq(@orig_data['who'])
+          expect(content['who']).not_to be_nil
         end
       end
 
@@ -115,19 +128,20 @@ describe Chef::Knife::SoloDataBagEdit do
         before do
           @secret_path                = '/var/chef/secret.txt'
           @knife.config[:secret_file] = @secret_path
-          Chef::EncryptedDataBagItem.stub(:load_secret).
-                                     with(@secret_path).
-                                     and_return('psst')
-          Chef::EncryptedDataBagItem.should_receive(:new).
-                                     with(@bag_item_foo.raw_data, 'psst').
-                                     and_return(@updated_data)
+          allow(Chef::EncryptedDataBagItem).to receive(:load_secret).
+                                               with(@secret_path).
+                                               and_return('psst')
+          allow(Chef::EncryptedDataBagItem).
+            to receive(:new).
+               with(@bag_item_foo.raw_data, 'psst').
+               and_return(@updated_data)
         end
 
         it 'should edit the encrypted data bag item' do
           @knife.run
           content = JSON.parse(File.read(@item_path))
-          content['who'].should_not == @orig_data['who']
-          content['who'].should_not be_nil
+          expect(content['who']).not_to eq(@orig_data['who'])
+          expect(content['who']).not_to be_nil
         end
       end
 
@@ -135,12 +149,14 @@ describe Chef::Knife::SoloDataBagEdit do
         before do
           @secret_path                             = '/var/chef/secret.txt'
           Chef::Config[:encrypted_data_bag_secret] = @secret_path
-          Chef::EncryptedDataBagItem.stub(:load_secret).
-                                     with(@secret_path).
-                                     and_return('psst')
-          Chef::EncryptedDataBagItem.should_receive(:new).
-                                     with(@bag_item_foo.raw_data, 'psst').
-                                     and_return(@updated_data)
+          allow(Chef::EncryptedDataBagItem).
+            to receive(:load_secret).
+               with(@secret_path).
+               and_return('psst')
+          allow(Chef::EncryptedDataBagItem).
+            to receive(:new).
+               with(@bag_item_foo.raw_data, 'psst').
+               and_return(@updated_data)
         end
 
         after { Chef::Config[:encrypted_data_bag_secret] = nil }
@@ -148,19 +164,20 @@ describe Chef::Knife::SoloDataBagEdit do
         it 'should edit the encrypted data bag item' do
           @knife.run
           content = JSON.parse(File.read(@item_path))
-          content['who'].should_not == @orig_data['who']
-          content['who'].should_not be_nil
+          expect(content['who']).not_to eq(@orig_data['who'])
+          expect(content['who']).not_to be_nil
         end
       end
 
       context 'with malformed JSON' do
         let(:user_wants_to_reedit) { 'Y' }
+        let(:bad_json) { '{,badjson}' }
 
         before do
-          @knife.config[:editor] = 'vimacs'
           @pass = 0
           @asked_to_continue = 0
-          File.stub(:read).with(tempfile_name) do
+
+          allow(File).to receive(:read).with(tempfile_name) do
             @pass += 1
             case @pass
             when 1
@@ -169,25 +186,36 @@ describe Chef::Knife::SoloDataBagEdit do
               @updated_data.to_json
             end
           end
-          @knife.ui.stub(:ask) do
+
+          allow(@knife.ui).to receive(:ask) do
             case @pass
             when 1
               @asked_to_continue += 1
               user_wants_to_reedit
+            else
+              nil
             end
           end
         end
 
         it 'asks whether to re-edit' do
           @knife.run
-          @asked_to_continue.should == 1
+          expect(@asked_to_continue).to eq(1)
         end
 
         context 'when the user wants to re-edit' do
+          before do
+            allow(Kernel).to receive(:system).
+                             with(edit_command).
+                             and_return(true)
+          end
+
           it 'the editor is re-opened' do
-            Kernel.should_receive(:system).with("vimacs #{tempfile_name}").
-                                           exactly(2).times.and_return(true)
             @knife.run
+
+            expect(Kernel).to have_received(:system).
+                              with(edit_command).
+                              exactly(2).times
           end
         end
 
@@ -195,9 +223,9 @@ describe Chef::Knife::SoloDataBagEdit do
           let(:user_wants_to_reedit) { 'N' }
 
           it 'an error is thrown' do
-            lambda {
+            expect do
               @knife.run
-            }.should raise_error(Yajl::ParseError)
+            end.to raise_error(StandardError)
           end
         end
       end

data/spec/unit/solo_data_bag_list_spec.rb

@@ -30,8 +30,8 @@ describe Chef::Knife::SoloDataBagList do
 
       it 'should list all of the data bags' do
         @knife.run
-        @stdout.string.should match /bag_1/
-        @stdout.string.should match /bag_2/
+        expect(@stdout.string).to match(/bag_1/)
+        expect(@stdout.string).to match(/bag_2/)
       end
 
       context 'with --data-bag-path' do
@@ -44,8 +44,8 @@ describe Chef::Knife::SoloDataBagList do
 
         it 'should list all of the data bags' do
           @knife.run
-          @stdout.string.should match /bag_1-opt/
-          @stdout.string.should match /bag_2-opt/
+          expect(@stdout.string).to match(/bag_1-opt/)
+          expect(@stdout.string).to match(/bag_2-opt/)
         end
       end
 

data/spec/unit/solo_data_bag_show_spec.rb

@@ -8,54 +8,58 @@ describe Chef::Knife::SoloDataBagShow do
   include_context 'stubbed_out_stdout_and_stderr'
 
   describe 'run' do
+    let(:bags_path) { '/var/chef/data_bags' }
+    let(:bag_path) { "#{bags_path}/bag_1" }
+
+    before do
+      FakeFS.activate!
+      FileUtils.mkdir_p bag_path
+      Chef::Config[:data_bag_path] = bags_path
+    end
+
+    after do
+      FakeFS.deactivate!
+      FakeFS::FileSystem.clear
+    end
+
     include_context 'bag_name_not_provided'
     include_context 'bag_path_is_not_valid'
     include_context 'secret_string_and_secret_file_are_both_provided'
 
     context 'with valid arguments' do
       before do
-        @bags_path       = '/var/chef/data_bags'
-        @bag_path        = "#{@bags_path}/bag_1"
         @knife.name_args = ['bag_1']
 
-        FakeFS.activate!
-        FileUtils.mkdir_p @bag_path
-
         @bag_item_foo = Chef::DataBagItem.from_hash 'id' => 'foo', 'who' => 'bob'
         @bag_item_bar = Chef::DataBagItem.from_hash 'id' => 'bar', 'who' => 'sue'
-        Chef::Config[:data_bag_path] = @bags_path
-      end
-
-      after do
-        FakeFS.deactivate!
-        FakeFS::FileSystem.clear
       end
 
       context 'if an item is not specified' do
         before do
           bag_items = {'foo' => @bag_item_foo, 'bar' => @bag_item_bar}
-          Chef::DataBag.should_receive(:load).with('bag_1').
-                                              and_return(bag_items)
+          allow(Chef::DataBag).to receive(:load).
+                                  with('bag_1').
+                                  and_return(bag_items)
         end
 
         it 'should show the list of items' do
           @knife.run
-          @stdout.string.should match /foo/
-          @stdout.string.should match /bar/
+          expect(@stdout.string).to match(/foo/)
+          expect(@stdout.string).to match(/bar/)
         end
 
         context 'with --data-bag-path' do
+          let(:bags_path) { '/opt/bags' }
+
           before do
-            @bags_path       = '/opt/bags'
-            @bag_path        = "#{@bags_path}/bag_1"
-            FileUtils.mkdir_p @bag_path
-            @knife.config[:data_bag_path] = @bags_path
+            FileUtils.mkdir_p bag_path
+            @knife.config[:data_bag_path] = bags_path
           end
 
           it 'uses the data bag path from the override' do
             @knife.run
-            @stdout.string.should match /foo/
-            @stdout.string.should match /bar/
+            expect(@stdout.string).to match(/foo/)
+            expect(@stdout.string).to match(/bar/)
           end
         end
 
@@ -67,37 +71,39 @@ describe Chef::Knife::SoloDataBagShow do
         end
 
         it 'should show the item' do
-          Chef::DataBagItem.should_receive(:load).with('bag_1', 'foo').
-                                                  and_return(@bag_item_foo)
+          allow(Chef::DataBagItem).to receive(:load).
+                                      with('bag_1', 'foo').
+                                      and_return(@bag_item_foo)
           @knife.run
-          @stdout.string.should match /id:\s+foo.+who:\s+bob/m
+          expect(@stdout.string).to match(/id:\s+foo.+who:\s+bob/m)
         end
 
         context 'and with -F of json' do
           before do
             @knife.config[:format] = 'json'
-            Chef::DataBagItem.should_receive(:load).with('bag_1', 'foo').
-                                                    and_return(@bag_item_foo)
+            allow(Chef::DataBagItem).to receive(:load).with('bag_1', 'foo').
+                                        and_return(@bag_item_foo)
           end
 
           it 'should show the item as json' do
             @knife.run
-            @stdout.string.should match /"id":\s+"foo".+"who":\s+"bob"/m
-            @stdout.string.should_not match /json_class/
+            expect(@stdout.string).to match(/"id":\s+"foo".+"who":\s+"bob"/m)
+            expect(@stdout.string).not_to match(/json_class/)
           end
         end
 
         context 'when encrypting with -s or --secret' do
           before do
             @knife.config[:secret] = 'SECRET'
-            Chef::EncryptedDataBagItem.should_receive(:load).
-                                       with('bag_1', 'foo', 'SECRET').
-                                       and_return(@bag_item_foo)
+            allow(Chef::EncryptedDataBagItem).
+              to receive(:load).
+                 with('bag_1', 'foo', 'SECRET').
+                 and_return(@bag_item_foo)
           end
 
           it 'should show the unencrypted item' do
             @knife.run
-            @stdout.string.should match /id:\s+foo.+who:\s+bob/m
+            expect(@stdout.string).to match(/id:\s+foo.+who:\s+bob/m)
           end
 
           context 'and with -F of json' do
@@ -107,8 +113,8 @@ describe Chef::Knife::SoloDataBagShow do
 
             it 'should show the unencrypted item as json' do
               @knife.run
-              @stdout.string.should match /"id":\s+"foo".+"who":\s+"bob"/m
-              @stdout.string.should_not match /json_class/
+              expect(@stdout.string).to match(/"id":\s+"foo".+"who":\s+"bob"/m)
+              expect(@stdout.string).not_to match(/json_class/)
             end
           end
         end
@@ -116,17 +122,17 @@ describe Chef::Knife::SoloDataBagShow do
         context 'when encrypting with --secret-file' do
           before do
             @knife.config[:secret_file] = '/var/tmp/secret'
-            Chef::EncryptedDataBagItem.should_receive(:load_secret).
-                                       with('/var/tmp/secret').
-                                       and_return('abcd')
-            Chef::EncryptedDataBagItem.should_receive(:load).
-                                       with('bag_1', 'foo', 'abcd').
-                                       and_return(@bag_item_foo)
+            allow(Chef::EncryptedDataBagItem).to receive(:load_secret).
+                                                  with('/var/tmp/secret').
+                                                  and_return('abcd')
+            allow(Chef::EncryptedDataBagItem).to receive(:load).
+                                                  with('bag_1', 'foo', 'abcd').
+                                                  and_return(@bag_item_foo)
           end
 
           it 'should show the unencrypted item' do
             @knife.run
-            @stdout.string.should match /id:\s+foo.+who:\s+bob/m
+            expect(@stdout.string).to match(/id:\s+foo.+who:\s+bob/m)
           end
 
           context 'and with -F of json' do
@@ -136,8 +142,8 @@ describe Chef::Knife::SoloDataBagShow do
 
             it 'should show the unencrypted item as json' do
               @knife.run
-              @stdout.string.should match /"id":\s+"foo".+"who":\s+"bob"/m
-              @stdout.string.should_not match /json_class/
+              expect(@stdout.string).to match(/"id":\s+"foo".+"who":\s+"bob"/m)
+              expect(@stdout.string).not_to match(/json_class/)
             end
           end
         end
@@ -146,17 +152,17 @@ describe Chef::Knife::SoloDataBagShow do
           before do
             @secret_path                             = '/var/chef/secret.txt'
             Chef::Config[:encrypted_data_bag_secret] = @secret_path
-            Chef::EncryptedDataBagItem.should_receive(:load_secret).
-                                       with(@secret_path).
-                                       and_return('abcd')
-            Chef::EncryptedDataBagItem.should_receive(:load).
-                                       with('bag_1', 'foo', 'abcd').
-                                       and_return(@bag_item_foo)
+            allow(Chef::EncryptedDataBagItem).to receive(:load_secret).
+                                                  with(@secret_path).
+                                                  and_return('abcd')
+            allow(Chef::EncryptedDataBagItem).to receive(:load).
+                                                  with('bag_1', 'foo', 'abcd').
+                                                  and_return(@bag_item_foo)
           end
 
           it 'should show the unencrypted item' do
             @knife.run
-            @stdout.string.should match /id:\s+foo.+who:\s+bob/m
+            expect(@stdout.string).to match(/id:\s+foo.+who:\s+bob/m)
           end
 
           context 'and with -F of json' do
@@ -166,8 +172,8 @@ describe Chef::Knife::SoloDataBagShow do
 
             it 'should show the unencrypted item as json' do
               @knife.run
-              @stdout.string.should match /"id":\s+"foo".+"who":\s+"bob"/m
-              @stdout.string.should_not match /json_class/
+              expect(@stdout.string).to match(/"id":\s+"foo".+"who":\s+"bob"/m)
+              expect(@stdout.string).not_to match(/json_class/)
             end
           end
         end

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo_data_bag
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Tommy Bishop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2016-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 description: A knife plugin for working with data bags and chef solo
 email:
 - bishop.thomas@gmail.com
@@ -66,23 +59,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .kitchen.yml
-- .rspec
-- .ruby-gemset
-- .travis.yml
+- ".gitignore"
+- ".kitchen.yml"
+- ".rspec"
+- ".ruby-gemset"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/Gemfile.chef.11.10.0
-- gemfiles/Gemfile.chef.11.10.2
-- gemfiles/Gemfile.chef.11.10.4
-- gemfiles/Gemfile.chef.11.4.4
-- gemfiles/Gemfile.chef.11.6.2
-- gemfiles/Gemfile.chef.11.8.0
-- gemfiles/Gemfile.chef.11.8.2
+- gemfiles/Gemfile.chef.11.18.12
+- gemfiles/Gemfile.chef.12.16.42
 - knife-solo_data_bag.gemspec
 - lib/chef/knife/solo_data_bag_create.rb
 - lib/chef/knife/solo_data_bag_edit.rb
@@ -105,39 +93,25 @@ files:
 - test/integration/data/solo.rb
 homepage: https://github.com/thbishop/knife-solo_data_bag
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A knife plugin for working with data bags and chef solo
-test_files:
-- spec/contexts/bag_name_not_provided.rb
-- spec/contexts/bag_path_is_not_valid.rb
-- spec/contexts/secret_string_and_secret_file_are_both_provided.rb
-- spec/contexts/stubbed_out_stdout_and_stderr.rb
-- spec/spec_helper.rb
-- spec/unit/solo_data_bag_create_spec.rb
-- spec/unit/solo_data_bag_edit_spec.rb
-- spec/unit/solo_data_bag_list_spec.rb
-- spec/unit/solo_data_bag_show_spec.rb
-- test/integration/bootstrap.sh
-- test/integration/data/cookbooks/foo/metadata.rb
-- test/integration/data/cookbooks/foo/recipes/default.rb
-- test/integration/data/solo.rb
+test_files: []

data/gemfiles/Gemfile.chef.11.10.4

@@ -1,5 +0,0 @@
-source "http://rubygems.org"
-
-gem 'chef', '11.10.4'
-
-gemspec :path => "../"

data/gemfiles/Gemfile.chef.11.4.4

@@ -1,5 +0,0 @@
-source "http://rubygems.org"
-
-gem 'chef', '11.4.4'
-
-gemspec :path => "../"

data/gemfiles/Gemfile.chef.11.6.2

@@ -1,5 +0,0 @@
-source "http://rubygems.org"
-
-gem 'chef', '11.6.2'
-
-gemspec :path => "../"

data/gemfiles/Gemfile.chef.11.8.0

@@ -1,5 +0,0 @@
-source "http://rubygems.org"
-
-gem 'chef', '11.8.0'
-
-gemspec :path => "../"

data/gemfiles/Gemfile.chef.11.8.2

@@ -1,5 +0,0 @@
-source "http://rubygems.org"
-
-gem 'chef', '11.8.2'
-
-gemspec :path => "../"