knife-solo_data_bag 1.0.0.beta.1 → 1.0.0.beta.2

data/.gitignore

@@ -16,3 +16,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.kitchen/
+.kitchen.local.yml
+test/integration/data/packages

data/.kitchen.yml

@@ -0,0 +1,13 @@
+---
+driver:
+  name: vagrant
+
+provisioner:
+  name: shell
+  script: test/integration/bootstrap.sh
+
+platforms:
+  - name: centos-6.4
+
+suites:
+  - name: default

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in knife-solo_data_bag.gemspec
 gemspec
+
+gem 'test-kitchen', '~> 1.2'
+gem 'kitchen-vagrant'

data/Rakefile

@@ -9,3 +9,10 @@ desc 'Run specs'
 RSpec::Core::RakeTask.new do |t|
   t.rspec_opts = %w(-fs --color)
 end
+
+begin
+  require 'kitchen/rake_tasks'
+  Kitchen::RakeTasks.new
+rescue LoadError
+  puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI']
+end

data/gemfiles/Gemfile.chef.11.10.0

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

data/gemfiles/Gemfile.chef.11.4.4

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

data/gemfiles/Gemfile.chef.11.6.2

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

data/gemfiles/Gemfile.chef.11.8.0

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

data/gemfiles/Gemfile.chef.11.8.2

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

data/lib/chef/knife/helpers.rb

@@ -19,6 +19,12 @@ module KnifeSoloDataBag
       Chef::Config[:data_bag_path]
     end
 
+    def persist_bag_item(item)
+      File.open bag_item_path, 'w' do |f|
+        f.write JSON.pretty_generate(item.raw_data)
+      end
+    end
+
     def secret_path
       Chef::Config[:encrypted_data_bag_secret]
     end

data/lib/chef/knife/solo_data_bag_create.rb

@@ -1,93 +1,95 @@
-module KnifeSoloDataBag
+require 'chef/knife'
 
-  class SoloDataBagCreate < Chef::Knife
+class Chef
+  class Knife
 
-    require 'chef/data_bag'
-    require 'chef/encrypted_data_bag_item'
-    require 'chef/knife/helpers'
-    require 'fileutils'
+    class SoloDataBagCreate < Knife
 
-    include KnifeSoloDataBag::Helpers
+      deps do
+        require 'chef/data_bag'
+        require 'fileutils'
+        require 'chef/encrypted_data_bag_item'
+        require 'chef/json_compat'
+        require 'chef/knife/helpers'
+      end
 
-    banner 'knife solo data bag create BAG [ITEM] (options)'
-    category 'solo data bag'
+      require 'chef/knife/solo_data_bag_helpers'
+      include Chef::Knife::SoloDataBagHelpers
 
-    attr_reader :bag_name, :item_name
+      banner 'knife solo data bag create BAG [ITEM] (options)'
+      category 'solo data bag'
 
-    option :secret,
-           :short => '-s SECRET',
-           :long  => '--secret SECRET',
-           :description => 'The secret key to use to encrypt data bag item values'
+      attr_reader :bag_name, :item_name
 
-    option :secret_file,
-           :long  => '--secret-file SECRET_FILE',
-           :description => 'A file containing the secret key to use to encrypt data bag item values'
+      option :secret,
+        :short => '-s SECRET',
+        :long  => '--secret SECRET',
+        :description => 'The secret key to use to encrypt data bag item values'
 
-    option :json_string,
-           :short => '-j JSON_STRING',
-           :long  => '--json JSON_STRING',
-           :description => 'The data bag json string that can be passed at the CLI'
+      option :secret_file,
+        :long  => '--secret-file SECRET_FILE',
+        :description => 'A file containing the secret key to use to encrypt data bag item values'
 
-    option :json_file,
-           :long  => '--json-file JSON_FILE',
-           :description => 'A file contining the data bag json string'
+      option :json_string,
+        :short => '-j JSON_STRING',
+        :long  => '--json JSON_STRING',
+        :description => 'The data bag json string that can be passed at the CLI'
 
-    option :data_bag_path,
-           :long => '--data-bag-path DATA_BAG_PATH',
-           :description => 'The path to data bag'
+      option :json_file,
+        :long  => '--json-file JSON_FILE',
+        :description => 'A file contining the data bag json string'
 
-    def run
-      @bag_name, @item_name = @name_args
-      ensure_valid_arguments
-      create_bag_directory
-      create_bag_item if item_name
-    end
+      option :data_bag_path,
+        :long => '--data-bag-path DATA_BAG_PATH',
+        :description => 'The path to data bag'
 
-    private
-    def bag_item_content(content)
-      return content unless should_be_encrypted?
-      Chef::EncryptedDataBagItem.encrypt_data_bag_item content, secret_key
-    end
+      def run
+        @bag_name, @item_name = @name_args
+        ensure_valid_arguments
+        create_bag_directory
+        create_bag_item if item_name
+      end
 
-    def create_bag_directory
-      FileUtils.mkdir_p bag_path unless File.exists? bag_path
-    end
+      private
+      def bag_item_content(content)
+        return content unless should_be_encrypted?
+        Chef::EncryptedDataBagItem.encrypt_data_bag_item content, secret_key
+      end
 
-    def create_item_object
-      item = nil
-      case
-      when config[:json_string]
-        item = Chef::DataBagItem.from_hash bag_item_content(convert_json_string)
-      when config[:json_file]
-        json_string = JSON.parse(File.read(config[:json_file]))
-        item = Chef::DataBagItem.from_hash bag_item_content(json_string)
-      else
-        create_object({'id' => item_name}, "data_bag_item[#{item_name}]") do |output|
-          item = Chef::DataBagItem.from_hash bag_item_content(output)
-        end
+      def create_bag_directory
+        FileUtils.mkdir_p bag_path unless File.exists? bag_path
       end
-      item
-    end
 
-    def create_bag_item
-      item = create_item_object
-      item.data_bag bag_name
-      persist_bag_item item
-    end
+      def create_item_object
+        item = nil
+        case
+        when config[:json_string]
+          item = Chef::DataBagItem.from_hash bag_item_content(convert_json_string)
+        when config[:json_file]
+          json_string = JSON.parse(File.read(config[:json_file]))
+          item = Chef::DataBagItem.from_hash bag_item_content(json_string)
+        else
+          create_object({'id' => item_name}, "data_bag_item[#{item_name}]") do |output|
+            item = Chef::DataBagItem.from_hash bag_item_content(output)
+          end
+        end
+        item
+      end
 
-    def ensure_valid_arguments
-      validate_bag_name_provided
-      validate_bags_path_exists
-      validate_multiple_secrets_were_not_provided
-      validate_json_string unless config[:json_string].nil?
-    end
+      def create_bag_item
+        item = create_item_object
+        item.data_bag bag_name
+        persist_bag_item item
+      end
 
-    def persist_bag_item(item)
-      File.open bag_item_path, 'w' do |f|
-        f.write item.to_json
+      def ensure_valid_arguments
+        validate_bag_name_provided
+        validate_bags_path_exists
+        validate_multiple_secrets_were_not_provided
+        validate_json_string unless config[:json_string].nil?
       end
+
     end
 
   end
-
 end

data/lib/chef/knife/solo_data_bag_edit.rb

@@ -1,77 +1,78 @@
-module KnifeSoloDataBag
+require 'chef/knife'
 
-  class SoloDataBagEdit < Chef::Knife
+class Chef
+  class Knife
 
-    require 'chef/knife/helpers'
+    class SoloDataBagEdit < Knife
 
-    include KnifeSoloDataBag::Helpers
+      deps do
+        require 'chef/knife/helpers'
+        require 'chef/knife/solo_data_bag_helpers'
+      end
 
-    banner 'knife solo data bag edit BAG ITEM (options)'
-    category 'solo data bag'
+      include Chef::Knife::SoloDataBagHelpers
 
-    attr_reader :bag_name, :item_name
+      banner 'knife solo data bag edit BAG ITEM (options)'
+      category 'solo data bag'
 
-    option :secret,
-           :short => '-s SECRET',
-           :long  => '--secret SECRET',
-           :description => 'The secret key to use to encrypt data bag item values'
+      attr_reader :bag_name, :item_name
 
-    option :secret_file,
-           :long  => '--secret-file SECRET_FILE',
-           :description => 'A file containing the secret key to use to encrypt data bag item values'
+      option :secret,
+        :short => '-s SECRET',
+        :long  => '--secret SECRET',
+        :description => 'The secret key to use to encrypt data bag item values'
 
-    option :data_bag_path,
-           :long => '--data-bag-path DATA_BAG_PATH',
-           :description => 'The path to data bag'
+      option :secret_file,
+        :long  => '--secret-file SECRET_FILE',
+        :description => 'A file containing the secret key to use to encrypt data bag item values'
 
-    def run
-      Chef::Config[:solo]   = true
-      @bag_name, @item_name = @name_args
-      ensure_valid_arguments
-      edit_content
-    end
+      option :data_bag_path,
+        :long => '--data-bag-path DATA_BAG_PATH',
+        :description => 'The path to data bag'
 
-    private
-    def edit_content
-      updated_content = edit_data existing_bag_item_content
-      item = Chef::DataBagItem.from_hash format_editted_content(updated_content)
-      item.data_bag bag_name
-      persist_bag_item item
-    end
+      def run
+        Chef::Config[:solo]   = true
+        @bag_name, @item_name = @name_args
+        ensure_valid_arguments
+        edit_content
+      end
 
-    def existing_bag_item_content
-      content = Chef::DataBagItem.load(bag_name, item_name).raw_data
+      private
+      def edit_content
+        updated_content = edit_data existing_bag_item_content
+        item = Chef::DataBagItem.from_hash format_editted_content(updated_content)
+        item.data_bag bag_name
+        persist_bag_item item
+      end
 
-      return content unless should_be_encrypted?
-      Chef::EncryptedDataBagItem.new(content, secret_key).to_hash
-    end
+      def existing_bag_item_content
+        content = Chef::DataBagItem.load(bag_name, item_name).raw_data
 
-    def format_editted_content(content)
-      return content unless should_be_encrypted?
-      Chef::EncryptedDataBagItem.encrypt_data_bag_item content, secret_key
-    end
+        return content unless should_be_encrypted?
+        Chef::EncryptedDataBagItem.new(content, secret_key).to_hash
+      end
 
-    def ensure_valid_arguments
-      validate_bag_name_provided
-      validate_item_name_provided
-      validate_bags_path_exists
-      validate_multiple_secrets_were_not_provided
-    end
+      def format_editted_content(content)
+        return content unless should_be_encrypted?
+        Chef::EncryptedDataBagItem.encrypt_data_bag_item content, secret_key
+      end
 
-    def persist_bag_item(item)
-      File.open bag_item_path, 'w' do |f|
-        f.write JSON.pretty_generate(JSON.parse(item.to_json))
+      def ensure_valid_arguments
+        validate_bag_name_provided
+        validate_item_name_provided
+        validate_bags_path_exists
+        validate_multiple_secrets_were_not_provided
       end
-    end
 
-    def validate_item_name_provided
-      unless item_name
-        show_usage
-        ui.fatal 'You must supply a name for the item'
-        exit 1
+      def validate_item_name_provided
+        unless item_name
+          show_usage
+          ui.fatal 'You must supply a name for the item'
+          exit 1
+        end
       end
+
     end
 
   end
-
 end

data/lib/chef/knife/solo_data_bag_helpers.rb

@@ -0,0 +1,83 @@
+require 'chef/knife'
+
+class Chef
+  class Knife
+
+    module SoloDataBagHelpers
+
+      def bag_item_path
+        File.expand_path File.join(bag_path, "#{item_name}.json")
+      end
+
+      def bag_path
+        File.expand_path File.join(bags_path, bag_name)
+      end
+
+      def bags_path
+        if config[:data_bag_path]
+          Chef::Config[:data_bag_path] = config[:data_bag_path]
+        end
+
+        Chef::Config[:data_bag_path]
+      end
+
+      def persist_bag_item(item)
+        File.open bag_item_path, 'w' do |f|
+          f.write JSON.pretty_generate(item.raw_data)
+        end
+      end
+
+      def secret_path
+        Chef::Config[:encrypted_data_bag_secret]
+      end
+
+      def secret_key
+        return config[:secret] if config[:secret]
+        Chef::EncryptedDataBagItem.load_secret(config[:secret_file] || secret_path)
+      end
+
+      def should_be_encrypted?
+        config[:secret] || config[:secret_file] || secret_path
+      end
+
+      def convert_json_string
+        JSON.parse config[:json_string]
+      end
+
+      def validate_bag_name_provided
+        unless bag_name
+          show_usage
+          ui.fatal 'You must supply a name for the data bag'
+          exit 1
+        end
+      end
+
+      def validate_bags_path_exists
+        unless File.directory? bags_path
+          raise Chef::Exceptions::InvalidDataBagPath,
+            "Configured data bag path '#{bags_path}' is invalid"
+        end
+      end
+
+      def validate_json_string
+        begin
+          JSON.parse config[:json_string], :create_additions => false
+        rescue => error
+          raise "Syntax error in #{config[:json_string]}: #{error.message}"
+        end
+      end
+
+      def validate_multiple_secrets_were_not_provided
+        if config[:secret] && config[:secret_file]
+          show_usage
+          ui.fatal 'Please specify either --secret or --secret-file only'
+          exit 1
+        elsif (config[:secret] && secret_path) || (config[:secret_file] && secret_path)
+          ui.warn 'The encrypted_data_bag_secret option defined in knife.rb was overriden by the command line.'
+        end
+      end
+
+    end
+
+  end
+end

data/lib/chef/knife/solo_data_bag_list.rb

@@ -1,36 +1,42 @@
-module KnifeSoloDataBag
+require 'chef/knife'
 
-  class SoloDataBagList < Chef::Knife
+class Chef
+  class Knife
 
-    require 'chef/knife/helpers'
+    class SoloDataBagList < Knife
 
-    include KnifeSoloDataBag::Helpers
+      deps do
+        require 'chef/knife/helpers'
+      end
 
-    banner 'knife solo data bag list (options)'
-    category 'solo data bag'
+      include Chef::Knife::SoloDataBagHelpers
 
-    attr_reader :bag_name
+      banner 'knife solo data bag list (options)'
+      category 'solo data bag'
 
-    option :data_bag_path,
-           :long => '--data-bag-path DATA_BAG_PATH',
-           :description => 'The path to data bag'
+      attr_reader :bag_name
 
-    def run
-      ensure_valid_arguments
-      output format_for_display(bags)
-    end
+      option :data_bag_path,
+        :long => '--data-bag-path DATA_BAG_PATH',
+        :description => 'The path to data bag'
 
-    private
-    def bags
-      Dir.entries(bags_path).select do |i|
-        File.directory?(File.expand_path(File.join(bags_path, i))) && i != '.' && i != '..'
+      def run
+        ensure_valid_arguments
+        output format_for_display(bags)
+      end
+
+      private
+      def bags
+        Dir.entries(bags_path).select do |i|
+          File.directory?(File.expand_path(File.join(bags_path, i))) && i != '.' && i != '..'
+        end
+      end
+
+      def ensure_valid_arguments
+        validate_bags_path_exists
       end
-    end
 
-    def ensure_valid_arguments
-      validate_bags_path_exists
     end
 
   end
-
 end

data/lib/chef/knife/solo_data_bag_show.rb

@@ -1,61 +1,67 @@
-module KnifeSoloDataBag
+require 'chef/knife'
 
-  class SoloDataBagShow < Chef::Knife
+class Chef
+  class Knife
 
-    require 'chef/knife/helpers'
+    class SoloDataBagShow < Knife
 
-    include KnifeSoloDataBag::Helpers
+      deps do
+        require 'chef/knife/helpers'
+      end
 
-    banner 'knife solo data bag show BAG [ITEM] (options)'
-    category 'solo data bag'
+      include Chef::Knife::SoloDataBagHelpers
 
-    attr_reader :bag_name, :item_name
+      banner 'knife solo data bag show BAG [ITEM] (options)'
+      category 'solo data bag'
 
-    option :secret,
-           :short => '-s SECRET',
-           :long  => '--secret SECRET',
-           :description => 'The secret key to use to encrypt data bag item values'
+      attr_reader :bag_name, :item_name
 
-    option :secret_file,
-           :long  => '--secret-file SECRET_FILE',
-           :description => 'A file containing the secret key to use to encrypt data bag item values'
+      option :secret,
+        :short => '-s SECRET',
+        :long  => '--secret SECRET',
+        :description => 'The secret key to use to encrypt data bag item values'
 
-    option :data_bag_path,
-           :long => '--data-bag-path DATA_BAG_PATH',
-           :description => 'The path to data bag'
+      option :secret_file,
+        :long  => '--secret-file SECRET_FILE',
+        :description => 'A file containing the secret key to use to encrypt data bag item values'
 
-    def run
-      Chef::Config[:solo]   = true
-      @bag_name, @item_name = @name_args
-      ensure_valid_arguments
-      display_content
-    end
+      option :data_bag_path,
+        :long => '--data-bag-path DATA_BAG_PATH',
+        :description => 'The path to data bag'
 
-    private
-    def bag_content
-      Chef::DataBag.load bag_name
-    end
+      def run
+        Chef::Config[:solo]   = true
+        @bag_name, @item_name = @name_args
+        ensure_valid_arguments
+        display_content
+      end
 
-    def bag_item_content
-      if should_be_encrypted?
-        raw = Chef::EncryptedDataBagItem.load(bag_name, item_name, secret_key)
-        raw.to_hash
-      else
-        Chef::DataBagItem.load(bag_name, item_name).raw_data
+      private
+      def bag_content
+        Chef::DataBag.load bag_name
       end
-    end
 
-    def display_content
-      content = item_name ? bag_item_content : bag_content
-      output format_for_display(content)
-    end
+      def bag_item_content
+        if should_be_encrypted?
+          raw = Chef::EncryptedDataBagItem.load(bag_name, item_name, secret_key)
+          raw.to_hash
+        else
+          Chef::DataBagItem.load(bag_name, item_name).raw_data
+        end
+      end
+
+      def display_content
+        content = item_name ? bag_item_content : bag_content
+        output format_for_display(content)
+      end
+
+      def ensure_valid_arguments
+        validate_bag_name_provided
+        validate_bags_path_exists
+        validate_multiple_secrets_were_not_provided
+      end
 
-    def ensure_valid_arguments
-      validate_bag_name_provided
-      validate_bags_path_exists
-      validate_multiple_secrets_were_not_provided
     end
 
   end
-
 end

data/lib/knife-solo_data_bag/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module SoloDataBag
-    VERSION = '1.0.0.beta.1'
+    VERSION = '1.0.0.beta.2'
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,13 @@
+$:.unshift File.expand_path('../../lib', __FILE__)
+
 require 'fakefs/safe'
-require 'knife-solo_data_bag'
+
+require 'chef'
+require 'chef/knife'
+require 'chef/knife/solo_data_bag_create'
+require 'chef/knife/solo_data_bag_edit'
+require 'chef/knife/solo_data_bag_list'
+require 'chef/knife/solo_data_bag_show'
 
 ['contexts', 'helpers', 'matchers'].each do |dir|
   Dir[File.expand_path(File.join(File.dirname(__FILE__),dir,'*.rb'))].each {|f| require f}

data/spec/unit/solo_data_bag_create_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe KnifeSoloDataBag::SoloDataBagCreate do
+describe Chef::Knife::SoloDataBagCreate do
   before do
     @knife  = subject
   end
@@ -46,9 +46,14 @@ describe KnifeSoloDataBag::SoloDataBagCreate do
 
         it 'should create the data bag item' do
           @knife.run
-          JSON.parse(File.read(@item_path))['raw_data'].should == @input_data
+          JSON.parse(File.read(@item_path)).should == @input_data
         end
 
+        it 'should write pretty json' do
+          @knife.run
+          File.read(@item_path).should == JSON.pretty_generate(@input_data)
+      end
+
         context 'with --data-bag-path' do
           before do
             @override_bags_path           = '/opt/bags'
@@ -71,7 +76,7 @@ describe KnifeSoloDataBag::SoloDataBagCreate do
 
           it 'should create the encrypted data bag item' do
             @knife.run
-            content = JSON.parse(File.read(@item_path))['raw_data']
+            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]
@@ -91,7 +96,7 @@ describe KnifeSoloDataBag::SoloDataBagCreate do
 
           it 'should create the encrypted data bag item' do
             @knife.run
-            content = JSON.parse(File.read(@item_path))['raw_data']
+            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]
@@ -112,7 +117,7 @@ describe KnifeSoloDataBag::SoloDataBagCreate do
 
           it 'creates the encrypted data bag item' do
             @knife.run
-            content = JSON.parse(File.read(@item_path))['raw_data']
+            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]
@@ -133,7 +138,7 @@ describe KnifeSoloDataBag::SoloDataBagCreate do
 
         it 'should create the data bag item' do
           @knife.run
-          JSON.parse(File.read(@item_path))['raw_data'].should == @input_data
+          JSON.parse(File.read(@item_path)).should == @input_data
         end
 
         context 'when encrypting with -s or --secret' do
@@ -144,7 +149,7 @@ describe KnifeSoloDataBag::SoloDataBagCreate do
 
           it 'should create the encrypted data bag item' do
             @knife.run
-            content = JSON.parse(File.read(@item_path))['raw_data']
+            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]
@@ -164,7 +169,7 @@ describe KnifeSoloDataBag::SoloDataBagCreate do
 
           it 'should create the encrypted data bag item' do
             @knife.run
-            content = JSON.parse(File.read(@item_path))['raw_data']
+            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]
@@ -185,7 +190,7 @@ describe KnifeSoloDataBag::SoloDataBagCreate do
 
           it 'creates the encrypted data bag item' do
             @knife.run
-            content = JSON.parse(File.read(@item_path))['raw_data']
+            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]
@@ -207,7 +212,7 @@ describe KnifeSoloDataBag::SoloDataBagCreate do
 
         it 'creates the data bag item' do
           @knife.run
-          JSON.parse(File.read(@item_path))['raw_data'].should == @input_data
+          JSON.parse(File.read(@item_path)).should == @input_data
         end
       end
 

data/spec/unit/solo_data_bag_edit_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe KnifeSoloDataBag::SoloDataBagEdit do
+describe Chef::Knife::SoloDataBagEdit do
   before do
     @knife  = subject
   end
@@ -55,21 +55,13 @@ describe KnifeSoloDataBag::SoloDataBagEdit do
 
       it 'should edit the data bag item' do
         @knife.run
-        JSON.parse(File.read(@item_path))['raw_data'].should == @updated_data
+        JSON.parse(File.read(@item_path)).should == @updated_data
       end
 
       it 'should write pretty json' do
         @knife.run
-        File.read(@item_path).should == %q({
-  "name": "data_bag_item_bag_1_foo",
-  "json_class": "Chef::DataBagItem",
-  "chef_type": "data_bag_item",
-  "data_bag": "bag_1",
-  "raw_data": {
-    "id": "foo",
-    "who": "sue"
-  }
-})
+        data = JSON.pretty_generate(:id => 'foo', :who => 'sue')
+        File.read(@item_path).should == data
       end
 
       context 'with --data-bag-path' do
@@ -83,7 +75,7 @@ describe KnifeSoloDataBag::SoloDataBagEdit do
 
         it 'uses the data bag path from the override' do
           @knife.run
-          data = JSON.parse(File.read(@override_item_path))['raw_data']
+          data = JSON.parse(File.read(@override_item_path))
           data.should == @updated_data
         end
       end
@@ -98,7 +90,7 @@ describe KnifeSoloDataBag::SoloDataBagEdit do
 
         it 'should edit the encrypted data bag item' do
           @knife.run
-          content = JSON.parse(File.read(@item_path))['raw_data']
+          content = JSON.parse(File.read(@item_path))
           content['who'].should_not == @orig_data['who']
           content['who'].should_not be_nil
         end
@@ -118,7 +110,7 @@ describe KnifeSoloDataBag::SoloDataBagEdit do
 
         it 'should edit the encrypted data bag item' do
           @knife.run
-          content = JSON.parse(File.read(@item_path))['raw_data']
+          content = JSON.parse(File.read(@item_path))
           content['who'].should_not == @orig_data['who']
           content['who'].should_not be_nil
         end
@@ -140,7 +132,7 @@ describe KnifeSoloDataBag::SoloDataBagEdit do
 
         it 'should edit the encrypted data bag item' do
           @knife.run
-          content = JSON.parse(File.read(@item_path))['raw_data']
+          content = JSON.parse(File.read(@item_path))
           content['who'].should_not == @orig_data['who']
           content['who'].should_not be_nil
         end

data/spec/unit/solo_data_bag_list_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe KnifeSoloDataBag::SoloDataBagList do
+describe Chef::Knife::SoloDataBagList do
   before do
     @knife = subject
   end

data/spec/unit/solo_data_bag_show_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe KnifeSoloDataBag::SoloDataBagShow do
+describe Chef::Knife::SoloDataBagShow do
   before do
     @knife  = subject
   end

data/test/integration/bootstrap.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -e
+
+function download_chef_version() {
+  echo -e "Installing curl..."
+  yum install -y curl
+  echo "Done"
+
+  echo -e "Downloading chef install script..."
+  curl -o /tmp/kitchen/data/chef_install.sh https://www.opscode.com/chef/install.sh
+  chmod +x /tmp/kitchen/data/chef_install.sh
+  echo "Done"
+  /tmp/kitchen/data/chef_install.sh -v $1
+}
+
+for version in 11.2.0-1 11.4.4-2 11.6.2-1 11.8.2-1 11.10.0-1; do
+  echo "##############################"
+  echo "# Processing $version"
+  echo "##############################"
+
+  if [ ! -f /tmp/kitchen/data/packages/chef-$version.el6.x86_64.rpm ]; then
+    download_chef_version $version
+  else
+    rpm -ivh --quiet /tmp/kitchen/data/packages/chef-$version*.rpm
+  fi
+
+  echo -e "Installing knife-solo_data_bag..."
+  /opt/chef/embedded/bin/gem install -q /tmp/kitchen/data/packages/*1.0.0.gem --no-ri --no-rdoc
+  echo "Done"
+
+  knife solo data bag create foo bar --data-bag-path /tmp/kitchen/data/data_bags -j '{ "id": "bar", "my": "data" }'
+
+  chef-solo -c /tmp/kitchen/data/solo.rb -o foo -l info
+
+  knife solo data bag show foo bar --data-bag-path /tmp/kitchen/data/data_bags
+
+  echo -e "Cleaning up..."
+  rpm -e --quiet chef
+
+  rm -fr /opt/chef
+  rm -fr /tmp/kitchend/data/data_bags/foo
+  echo "Done"
+done
+
+exit 0

data/test/integration/data/cookbooks/foo/metadata.rb

@@ -0,0 +1,2 @@
+name 'foo'
+version '0.1.0'

data/test/integration/data/cookbooks/foo/recipes/default.rb

@@ -0,0 +1,5 @@
+item = data_bag_item('foo', 'bar')
+
+unless item['my'] == 'data'
+  Chef::Application.fatal! "data is incorrect. item == #{item.inspect}"
+end

data/test/integration/data/solo.rb

@@ -0,0 +1,2 @@
+cookbook_path ['/tmp/kitchen/data/cookbooks']
+data_bag_path '/tmp/kitchen/data/data_bags'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo_data_bag
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.1
+  version: 1.0.0.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .kitchen.yml
 - .rspec
 - .ruby-gemset
 - .travis.yml
@@ -75,6 +76,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/Gemfile.chef.11.10.0
 - gemfiles/Gemfile.chef.11.4.4
 - gemfiles/Gemfile.chef.11.6.2
 - gemfiles/Gemfile.chef.11.8.0
@@ -83,9 +85,9 @@ files:
 - lib/chef/knife/helpers.rb
 - lib/chef/knife/solo_data_bag_create.rb
 - lib/chef/knife/solo_data_bag_edit.rb
+- lib/chef/knife/solo_data_bag_helpers.rb
 - lib/chef/knife/solo_data_bag_list.rb
 - lib/chef/knife/solo_data_bag_show.rb
-- lib/knife-solo_data_bag.rb
 - lib/knife-solo_data_bag/version.rb
 - spec/contexts/bag_name_not_provided.rb
 - spec/contexts/bag_path_is_not_valid.rb
@@ -96,6 +98,10 @@ files:
 - 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
 homepage: https://github.com/thbishop/knife-solo_data_bag
 licenses: []
 post_install_message: 
@@ -130,3 +136,7 @@ test_files:
 - 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

data/lib/knife-solo_data_bag.rb

@@ -1,11 +0,0 @@
-require 'chef/exceptions'
-require 'chef/knife'
-require 'chef/knife/solo_data_bag_create'
-require 'chef/knife/solo_data_bag_edit'
-require 'chef/knife/solo_data_bag_list'
-require 'chef/knife/solo_data_bag_show'
-require 'knife-solo_data_bag/version'
-
-module Knife
-  module SoloDataBag; end
-end