knife-solo_data_bag 1.0.1 → 1.1.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## head
 
+# 1.1.0 (04/10/2014)
+
+* add ability to correct incorrect text when editing a data bag
+
 # 1.0.1 (03/06/2014)
 
 * fix loading of helpers (#18)

data/lib/chef/knife/solo_data_bag_edit.rb

@@ -1,3 +1,4 @@
+require 'tempfile'
 require 'chef/knife'
 
 class Chef
@@ -35,12 +36,48 @@ class Chef
 
       private
       def edit_content
-        updated_content = edit_data existing_bag_item_content
+        content = Chef::JSONCompat.to_json_pretty(existing_bag_item_content)
+        updated_content = nil
+        loop do
+          unparsed = edit_text content
+          begin
+            updated_content = Chef::JSONCompat.from_json(unparsed)
+            break
+          rescue Yajl::ParseError => 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"
+              continue = ui.ask question
+              case continue
+              when 'Y', 'y'
+                content = unparsed
+                break
+              when 'N', 'n'
+                raise e
+              else
+                ui.stdout.puts 'Please answer Y or N'
+              end
+            end
+          end
+        end
         item = Chef::DataBagItem.from_hash format_editted_content(updated_content)
         item.data_bag bag_name
         persist_bag_item item
       end
 
+      def edit_text(text)
+        tf = Tempfile.new(['knife-edit', '.json'])
+        tf.sync = true
+        tf.puts text
+        tf.close
+
+        raise "Please set EDITOR environment variable" unless Kernel.system("#{config[:editor]} #{tf.path}")
+
+        output = File.read(tf.path)
+        tf.unlink
+        output
+      end
+
       def existing_bag_item_content
         content = Chef::DataBagItem.load(bag_name, item_name).raw_data
 

data/lib/knife-solo_data_bag/version.rb

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

data/spec/unit/solo_data_bag_edit_spec.rb

@@ -27,6 +27,18 @@ describe Chef::Knife::SoloDataBagEdit do
     end
 
     context 'with valid arguments' do
+      let(:tf) do
+        double(
+          'Tempfile',
+          :sync= => nil,
+          :puts => nil,
+          :close => nil,
+          :path => tempfile_name,
+          :unlink => true
+        )
+      end
+      let(:tempfile_name) { '/tmp/foo' }
+
       before do
         @bags_path        = '/var/chef/data_bags'
         @bag_path         = "#{@bags_path}/bag_1"
@@ -44,7 +56,10 @@ describe Chef::Knife::SoloDataBagEdit do
 
         Chef::DataBagItem.should_receive(:load).with('bag_1', 'foo').
                                                 and_return(@bag_item_foo)
-        @knife.stub(:edit_data).and_return(@updated_data)
+        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
 
@@ -138,6 +153,55 @@ describe Chef::Knife::SoloDataBagEdit do
         end
       end
 
+      context 'with malformed JSON' do
+        let(:user_wants_to_reedit) { 'Y' }
+
+        before do
+          @knife.config[:editor] = 'vimacs'
+          @pass = 0
+          @asked_to_continue = 0
+          File.stub(:read).with(tempfile_name) do
+            @pass += 1
+            case @pass
+            when 1
+              '{,badjson}'
+            else
+              @updated_data.to_json
+            end
+          end
+          @knife.ui.stub(:ask) do
+            case @pass
+            when 1
+              @asked_to_continue += 1
+              user_wants_to_reedit
+            end
+          end
+        end
+
+        it 'asks whether to re-edit' do
+          @knife.run
+          @asked_to_continue.should == 1
+        end
+
+        context 'when the user wants to re-edit' do
+          it 'the editor is re-opened' do
+            Kernel.should_receive(:system).with("vimacs #{tempfile_name}").
+                                           exactly(2).times.and_return(true)
+            @knife.run
+          end
+        end
+
+        context "the user doesn't want to re-edit" do
+          let(:user_wants_to_reedit) { 'N' }
+
+          it 'an error is thrown' do
+            lambda {
+              @knife.run
+            }.should raise_error(Yajl::ParseError)
+          end
+        end
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo_data_bag
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake