knife-solo_data_bag 1.0.0 → 1.0.1.beta.1

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## head
 
+* fix loading of helpers (#18)
+
 # 1.0.0 (02/27/2014)
 * Only supports > chef 11.4. Use pre 1.0.0 versions for older chef support
 

data/lib/chef/knife/solo_data_bag_create.rb

@@ -10,7 +10,6 @@ class Chef
         require 'fileutils'
         require 'chef/encrypted_data_bag_item'
         require 'chef/json_compat'
-        require 'chef/knife/helpers'
       end
 
       require 'chef/knife/solo_data_bag_helpers'

data/lib/chef/knife/solo_data_bag_edit.rb

@@ -5,11 +5,7 @@ class Chef
 
     class SoloDataBagEdit < Knife
 
-      deps do
-        require 'chef/knife/helpers'
-        require 'chef/knife/solo_data_bag_helpers'
-      end
-
+      require 'chef/knife/solo_data_bag_helpers'
       include Chef::Knife::SoloDataBagHelpers
 
       banner 'knife solo data bag edit BAG ITEM (options)'

data/lib/chef/knife/solo_data_bag_list.rb

@@ -5,10 +5,7 @@ class Chef
 
     class SoloDataBagList < Knife
 
-      deps do
-        require 'chef/knife/helpers'
-      end
-
+      require 'chef/knife/solo_data_bag_helpers'
       include Chef::Knife::SoloDataBagHelpers
 
       banner 'knife solo data bag list (options)'

data/lib/chef/knife/solo_data_bag_show.rb

@@ -5,10 +5,7 @@ class Chef
 
     class SoloDataBagShow < Knife
 
-      deps do
-        require 'chef/knife/helpers'
-      end
-
+      require 'chef/knife/solo_data_bag_helpers'
       include Chef::Knife::SoloDataBagHelpers
 
       banner 'knife solo data bag show BAG [ITEM] (options)'

data/lib/knife-solo_data_bag/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo_data_bag
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1.beta.1
+  prerelease: 6
 platform: ruby
 authors:
 - Tommy Bishop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,7 +84,6 @@ files:
 - gemfiles/Gemfile.chef.11.8.0
 - gemfiles/Gemfile.chef.11.8.2
 - knife-solo_data_bag.gemspec
-- 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
@@ -119,9 +118,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/chef/knife/helpers.rb

@@ -1,79 +0,0 @@
-module KnifeSoloDataBag
-  module Helpers
-
-    require 'json'
-
-    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