knife-solo_data_bag 0.2.0 → 0.2.1

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+
+gemfile:
+  - ./gemfiles/Gemfile.chef.0.10.10
+  - ./gemfiles/Gemfile.chef.10.12.0

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## head
 
+## 0.2.1 (07/08/2012)
+* Fixed an issue with show command and JSON output format (props to Ziad Sawalha)
+
 ## 0.2.0 (07/01/2012)
 * Add support for specifying JSON content on the command line (props to BK Box)
 

data/README.md

@@ -1,6 +1,9 @@
 # Knife Solo Data Bag
 A knife plugin to make working with data bags easier in a chef solo environment
 
+## Build Status
+![Build Status](https://secure.travis-ci.org/thbishop/knife-solo_data_bag.png)
+
 ## Installation
 
     gem install knife-solo_data_bag
@@ -55,13 +58,29 @@ Show the unencrypted content of an encrypted data bag with the provided file con
 
     $ knife solo data bag show apps app_1 --secret-file 'SECRET_FILE'
 
+You can also display any of the above variations in JSON format with `-F json`
+
+    $ knife solo data bag show apps app_1 -s secret_key -F json
+
 ## Notes
 This plugin will rely on the configured data_bag_path for placement of the data
 bags.  This defaults to '/var/chef/data_bags', but can be overriden in your chef
 client config.
 
-### Chef Support
-This plugin has only been tested with version 0.10.10 of chef.
+## Version Support
+This plugin has been tested on the following:
+
+Chef:
+* 0.10.10
+* 10.12.0
+
+Ruby:
+* 1.9.2
+* 1.9.3
+
+OS:
+* OSX
+* Linux
 
 ## Contribute
 * Fork the project

data/gemfiles/Gemfile.chef.0.10.10

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

data/gemfiles/Gemfile.chef.10.12.0

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

data/knife-solo_data_bag.gemspec

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

data/lib/chef/knife/solo_data_bag_show.rb

@@ -34,7 +34,8 @@ module KnifeSoloDataBag
 
     def bag_item_content
       if should_be_encrypted?
-        Chef::EncryptedDataBagItem.load bag_name, item_name, secret_key
+        raw = Chef::EncryptedDataBagItem.load(bag_name, item_name, secret_key)
+        raw.to_hash
       else
         Chef::DataBagItem.load(bag_name, item_name).raw_data
       end

data/lib/knife-solo_data_bag/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module SoloDataBag
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/spec/unit/solo_data_bag_show_spec.rb

@@ -57,6 +57,20 @@ describe KnifeSoloDataBag::SoloDataBagShow do
           @stdout.string.should 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)
+          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/
+          end
+        end
+
         context 'when encrypting with -s or --secret' do
           before do
             @knife.config[:secret] = 'SECRET'
@@ -69,6 +83,18 @@ describe KnifeSoloDataBag::SoloDataBagShow do
             @knife.run
             @stdout.string.should match /id:\s+foo.+who:\s+bob/m
           end
+
+          context 'and with -F of json' do
+            before do
+              @knife.config[:format] = 'json'
+            end
+
+            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/
+            end
+          end
         end
 
         context 'when encrypting with --secret-file' do
@@ -86,6 +112,18 @@ describe KnifeSoloDataBag::SoloDataBagShow do
             @knife.run
             @stdout.string.should match /id:\s+foo.+who:\s+bob/m
           end
+
+          context 'and with -F of json' do
+            before do
+              @knife.config[:format] = 'json'
+            end
+
+            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/
+            end
+          end
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo_data_bag
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000Z
+date: 2012-07-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70100793125240 !ruby/object:Gem::Requirement
+  requirement: &70133067504540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: 0.10.10
   type: :development
   prerelease: false
-  version_requirements: *70100793125240
+  version_requirements: *70133067504540
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70133067504120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70133067504120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70100793124740 !ruby/object:Gem::Requirement
+  requirement: &70133067503580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70100793124740
+  version_requirements: *70133067503580
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70100793124280 !ruby/object:Gem::Requirement
+  requirement: &70133067503080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +54,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70100793124280
+  version_requirements: *70133067503080
 description: A knife plugin for working with data bags and chef solo
 email:
 - bishop.thomas@gmail.com
@@ -53,11 +64,14 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/Gemfile.chef.0.10.10
+- gemfiles/Gemfile.chef.10.12.0
 - knife-solo_data_bag.gemspec
 - lib/chef/knife/helpers.rb
 - lib/chef/knife/solo_data_bag_create.rb