knife-chop 0.5.15 → 0.6.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTAwNTMzYTI2OWYyN2NhYzg4N2I1NDlhOGJiNmY5YzBiMzYxZDY4Yg==
+    NGQyNmM4YzYxMmJjMmY4N2UzMzNjYjUwYjM1ZGRjZGM2YTQ2ODM0Mw==
   data.tar.gz: !binary |-
-    MzM1ZTgyNzdkOWNiM2FjZDc0ODYzZWI1MWU4YjZmNDg2N2FjMGM4NQ==
+    ZTg5MGQwYWQ0ZmI3YmM0ZWZkNGM3YWZiOTMyY2EzMjUwNmI1ODgyOA==
 SHA512:
   metadata.gz: !binary |-
-    YjUwZmM1YWZiN2ZjM2EwNjE2ZjE5ZWYyMjVkNzNjYWY4ODVmYjY0MmFhZjA5
-    ZjQ4ZjgwNTc0Y2MxYWQ1MWI0MjI2YmRjZDU1NDg3YjQ0YWVhNjRlY2UwODg3
-    NzBhOWExOWZkYmE5NGVjN2YzZTgyZTVmNzZjZGQyODY5MDUwNTc=
+    OGQ5NDhlYmNjMGEyZmFhMzU2MGZmNjAyZWU1MjI1NjYyNzRlZWI0MzQ0ZjA0
+    NTYxNTA0MDU1ZDg4ZDdkZWRkMGJlOWUwYTZlNTExNTMzYTc4Y2I0MTFmZmU4
+    YTczNGRiNTFkMDNiZjQ1YmYyNzMwODc3NGM1MzkzNGQwZGMyMjE=
   data.tar.gz: !binary |-
-    OGI3YzM1NDJjNzU0YzdhMDFiYzIwYWMwNTZiZmQyNDg1NzQwOWUzNmEyN2Qw
-    MDg2OTQ2NzQ4OWY3NDdkY2MyMzE3NGU4Y2M5NWNkY2Y3ZTdiZGY3NjRlYWFk
-    Zjc1YmIzYWE1YzU3OTkyZWE0MzA2ZWRjMjFjMjZmNzcwNGNlYWM=
+    OGM2NDNjODRmOGVlYzk0NWViZmM2Mzc1MzAzYTc5OTZiZGI3MTcxN2Y2OTY0
+    MmQ3YTFjZTA3M2VkNzJiYzExNzdmMTcwYTNlNTQ1ZTc1YzYyNmJhMmI1Mjc4
+    NmM5ZmY1MzRjNjFjZDk2MWE5YTk1ZDdjNWM3ZDU2NzllZGE1ZmQ=

data/Gemfile

@@ -7,9 +7,10 @@ gem 'logging', '~> 1.8', '>= 1.8.2'
 gem 'inifile', '~> 2.0', '>= 2.0.2'
 gem 'json', '~> 1.8', '>= 1.8.1' #, '<= 1.7.7'
 gem 'mixlib-config', '~> 2.1', '>= 2.1.0'
-gem 'chef', '~> 11.10', '>= 11.10.0'
+gem 'chef', '~> 11.12', '>= 11.12.0'
 gem 'unf', '~> 0.1', '>= 0.1.4' # For Fog
 gem 'knife-ec2', '~> 0.6', '>= 0.6.6'
+gem 'safe_yaml'
 #
 ## Add dependencies to develop your gem here.
 ## Include everything needed to run rake, tests, features, etc.
@@ -19,6 +20,6 @@ group :development do
 #  gem "cucumber", ">= 0"
 #  gem "bundler", "~> 1.0"
 #  gem "rcov", ">= 0"
-#   gem 'jeweler', '>= 1.8.8'
-#   gem "rspec", '~> 2.14', '>= 2.14.1'
+  gem 'jeweler', '>= 2.0.1', '~> 2.0'
+  gem "rspec", '~> 2.14', '>= 2.14.1'
 end

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    knife-chop (0.5.15)
+    knife-chop (0.6.7)
       awesome_print (~> 1.2, >= 1.2.0)
-      chef (~> 11.10, >= 11.10.0)
+      chef (~> 11.12, >= 11.10.0)
       colorize (~> 0.7, >= 0.7.1)
       inifile (~> 2.0, >= 2.0.2)
       json (~> 1.8, >= 1.8.1)
@@ -16,12 +16,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.6)
-    akami (1.2.1)
+    akami (1.2.2)
       gyoku (>= 0.4.0)
       nokogiri
     awesome_print (1.2.0)
     builder (3.2.2)
-    chef (11.12.0)
+    chef (11.12.4)
       chef-zero (~> 2.0, >= 2.0.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -35,7 +35,7 @@ GEM
       mixlib-shellout (~> 1.4)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
-      ohai (~> 7.0)
+      ohai (~> 7.0.4)
       pry (~> 0.9)
       rest-client (>= 1.0.4, < 1.7.0)
       yajl-ruby (~> 1.1)
@@ -83,7 +83,7 @@ GEM
       ffi (>= 1.0.1)
     gyoku (1.1.1)
       builder (>= 2.1.2)
-    hashie (2.1.0)
+    hashie (2.1.1)
     highline (1.6.21)
     httpclient (2.3.4.1)
     httpi (0.9.7)
@@ -100,12 +100,12 @@ GEM
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.11)
+    jwt (0.1.13)
       multi_json (>= 1.5)
     knife-ec2 (0.8.0)
       fog (~> 1.20.0)
       knife-windows (>= 0.5.12)
-    knife-windows (0.5.15)
+    knife-windows (0.6.0)
       em-winrm (~> 0.5, >= 0.5.4)
     little-plugger (1.1.3)
     logging (1.8.2)
@@ -113,26 +113,26 @@ GEM
       multi_json (>= 1.8.4)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.5.3)
+    mini_portile (0.6.0)
     mixlib-authentication (1.3.0)
       mixlib-log
-    mixlib-cli (1.4.0)
+    mixlib-cli (1.5.0)
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
     mixlib-shellout (1.4.0)
-    multi_json (1.9.2)
+    multi_json (1.10.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    net-scp (1.1.2)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
+    net-ssh (2.9.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.0)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     nori (1.1.5)
     oauth2 (0.9.3)
       faraday (>= 0.8, < 0.10)
@@ -140,7 +140,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    ohai (7.0.0)
+    ohai (7.0.4)
       ipaddress
       mime-types (~> 1.16)
       mixlib-cli
@@ -154,7 +154,7 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rake (10.2.2)
+    rake (10.3.1)
     rdoc (4.1.1)
       json (~> 1.4)
     rest-client (1.6.7)
@@ -168,6 +168,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     rubyntlm (0.1.1)
+    safe_yaml (1.0.3)
     savon (0.9.5)
       akami (~> 1.0)
       builder (>= 2.1.2)
@@ -200,14 +201,15 @@ PLATFORMS
 
 DEPENDENCIES
   awesome_print (~> 1.2, >= 1.2.0)
-  chef (~> 11.10, >= 11.10.0)
+  chef (~> 11.12, >= 11.12.0)
   colorize (~> 0.7, >= 0.7.1)
   inifile (~> 2.0, >= 2.0.2)
-  jeweler (>= 1.8.8)
+  jeweler (~> 2.0, >= 2.0.1)
   json (~> 1.8, >= 1.8.1)
   knife-chop!
   knife-ec2 (~> 0.6, >= 0.6.6)
   logging (~> 1.8, >= 1.8.2)
   mixlib-config (~> 2.1, >= 2.1.0)
   rspec (~> 2.14, >= 2.14.1)
+  safe_yaml
   unf (~> 0.1, >= 0.1.4)

data/VERSION

@@ -1 +1 @@
-0.5.15
+0.6.7

data/bin/chop

@@ -2,6 +2,9 @@
 
 require 'rubygems'
 
+require 'safe_yaml'
+SafeYAML::OPTIONS[:default_mode] = :safe
+
 # Borrowing from "whiches" gem ...
 cmd  = 'knife'
 exes = []

data/knife-chop.gemspec

@@ -2,16 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: knife-chop 0.5.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "knife-chop"
-  s.version = IO.read(File.join(File.dirname(__FILE__), 'VERSION')).chomp rescue '1.0.0'
+  s.version = IO.read('VERSION')
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Christo De Lange"]
-  s.date = "2014-04-10"
+  s.date = "2014-05-14"
   s.description = "Knife plugin to assist with the upload and sync of Chef server assets like roles, environments and cookbooks allowing for multiple parts to be uploaded at once to multiple environments. Resources can be matched with regular expressions."
   s.email = "rubygems@dldinternet.com"
   s.executables = ["chop"]
@@ -29,6 +28,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/chop",
     "knife-chop.gemspec",
+    "knife-chop.iml",
     "lib/chef/knife/chop/chef_data_bag_item.rb",
     "lib/chef/knife/chop/chef_environment.rb",
     "lib/chef/knife/chop/chef_knife.rb",
@@ -79,21 +79,19 @@ Gem::Specification.new do |s|
   s.rubygems_version = "2.2.2"
   s.summary = "Knife plugin to ease the upload and sync of Chef server assets"
 
-  if s.respond_to? :specification_version
+  if s.respond_to? :specification_version then
     s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<awesome_print>, [">= 1.2.0", "~> 1.2"])
       s.add_runtime_dependency(%q<colorize>, [">= 0.7.1", "~> 0.7"])
       s.add_runtime_dependency(%q<logging>, [">= 1.8.2", "~> 1.8"])
       s.add_runtime_dependency(%q<inifile>, [">= 2.0.2", "~> 2.0"])
       s.add_runtime_dependency(%q<json>, [">= 1.8.1", "~> 1.8"])
       s.add_runtime_dependency(%q<mixlib-config>, [">= 2.1.0", "~> 2.1"])
-      s.add_runtime_dependency(%q<chef>, [">= 11.10.0", "~> 11.10"])
+      s.add_runtime_dependency(%q<chef>, [">= 11.10.0", "~> 11.12"])
       s.add_runtime_dependency(%q<unf>, [">= 0.1.4", "~> 0.1"])
       s.add_runtime_dependency(%q<knife-ec2>, [">= 0.6.6", "~> 0.6"])
-      s.add_development_dependency(%q<rspec>, [">= 2.14.1", "~> 2.14"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.8.8"])
     else
       s.add_dependency(%q<awesome_print>, [">= 1.2.0", "~> 1.2"])
       s.add_dependency(%q<colorize>, [">= 0.7.1", "~> 0.7"])
@@ -101,11 +99,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<inifile>, [">= 2.0.2", "~> 2.0"])
       s.add_dependency(%q<json>, [">= 1.8.1", "~> 1.8"])
       s.add_dependency(%q<mixlib-config>, [">= 2.1.0", "~> 2.1"])
-      s.add_dependency(%q<chef>, [">= 11.10.0", "~> 11.10"])
+      s.add_dependency(%q<chef>, [">= 11.10.0", "~> 11.12"])
       s.add_dependency(%q<unf>, [">= 0.1.4", "~> 0.1"])
       s.add_dependency(%q<knife-ec2>, [">= 0.6.6", "~> 0.6"])
-      s.add_dependency(%q<rspec>, [">= 2.14.1", "~> 2.14"])
-      s.add_dependency(%q<jeweler>, [">= 1.8.8"])
     end
   else
     s.add_dependency(%q<awesome_print>, [">= 1.2.0", "~> 1.2"])
@@ -114,11 +110,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<inifile>, [">= 2.0.2", "~> 2.0"])
     s.add_dependency(%q<json>, [">= 1.8.1", "~> 1.8"])
     s.add_dependency(%q<mixlib-config>, [">= 2.1.0", "~> 2.1"])
-    s.add_dependency(%q<chef>, [">= 11.10.0", "~> 11.10"])
+    s.add_dependency(%q<chef>, [">= 11.10.0", "~> 11.12"])
     s.add_dependency(%q<unf>, [">= 0.1.4", "~> 0.1"])
     s.add_dependency(%q<knife-ec2>, [">= 0.6.6", "~> 0.6"])
-    s.add_dependency(%q<rspec>, [">= 2.14.1", "~> 2.14"])
-    s.add_dependency(%q<jeweler>, [">= 1.8.8"])
   end
 end
 

data/knife-chop.iml

@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="bash" name="BashSupport">
+      <configuration>
+        <operationMode type="AcceptAll" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="ModuleRunConfigurationManager">
+    <configuration default="false" name="chop" type="RubyRunConfigurationType" factoryName="Ruby" singleton="true">
+      <module name="knife-chop" />
+      <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+      <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/bin" />
+      <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
+      <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="RVM: ruby-1.9.3-p545 [knife-chop]" />
+      <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
+      <envs>
+        <env name="RC_KEYP" value="curriculum-poc-admin" />
+        <env name="KNIFE_CLIENT_KEY" value="/Users/cdl/IDrive-Sync/Dropbox/DLDInternet/rc/chef/server/aws.curriculum-poc/cdelange.pem" />
+        <env name="EC2_HOME" value="/usr/local/ec2-api-tools" />
+        <env name="RC_CMSA" value="aws.curriculum-poc" />
+        <env name="RC_PS1" value="'\e[0;30m\e[47m===== \t (\! $?) \u@\H:\w =====\e[m-\e[0m\e[48;5;56m$(parse_git_branch)\e[m-${PSRC}-${PSOC}-$(parse_rvm_env)\n$'" />
+        <env name="KNIFE_CHEF_SERVER_URL" value="https://chef.poc.ae1.currdc.net" />
+        <env name="KNIFE_VALIDATION_CLIENT_NAME" value="chef-validator" />
+        <env name="AWS_REGION" value="us-east-1" />
+        <env name="RC_CMMS" value="chef" />
+        <env name="AWS_INSTANCE_TYPE" value="t1.micro" />
+        <env name="RC_ZONE" value="use-1" />
+        <env name="AWS_SECRET_ACCESS_KEY" value="kvPq38Ca0HXjC+AIRhQfdNifawtbHYUGPkkC1N/+" />
+        <env name="AWS_S3CFG" value="/Users/cdl/IDrive-Sync/Dropbox/DLDInternet/rc/aws/aws.curriculum-poc/cdelange.s3cfg" />
+        <env name="KNIFE_CLIENT_NAME" value="cdelange" />
+        <env name="EC2_URL" value="https://ec2.us-east-1.amazonaws.com" />
+        <env name="AWS_DEFAULT_OUTPUT" value="text" />
+        <env name="AWS_KEY_PATH" value="/Users/cdl/IDrive-Sync/Dropbox/DLDInternet/rc/aws/aws.curriculum-poc/curriculum-poc-admin/curriculum-poc-admin-aws.curriculum-poc-use-1.pem" />
+        <env name="AWS_SECRET_KEY" value="kvPq38Ca0HXjC+AIRhQfdNifawtbHYUGPkkC1N/+" />
+        <env name="KNIFE_CHEF_SERVER_NAME" value="chef.poc.ae1.currdc.net" />
+        <env name="AWS_SUBNET_ID" value="subnet-e9861081" />
+        <env name="RC_USER" value="cdelange" />
+        <env name="RC_CLOUD" value="aws" />
+        <env name="RC_DIR" value="/Users/cdl/IDrive-Sync/Dropbox/DLDInternet/rc" />
+        <env name="AWS_DEFAULT_REGION" value="us-east-1" />
+        <env name="AWS_SSH_USERNAME" value="ec2-user" />
+        <env name="AWS_SECURITY_GROUPS" value="default" />
+        <env name="AWS_ACCESS_KEY_ID" value="AKIAJFTF66B2U47ALRSQ" />
+        <env name="KNIFE_CHEF_SERVER_INT_IP" value="10.162.4.20" />
+        <env name="KNIFE_WHISK_CONFIG" value="/Users/cdl/IDrive-Sync/Dropbox/DLDInternet/rc/aws/aws.curriculum-poc/whisk.yaml" />
+        <env name="KNIFE_VALIDATION_KEY" value="/Users/cdl/IDrive-Sync/Dropbox/DLDInternet/rc/chef/server/aws.curriculum-poc/chef-validator.pem" />
+        <env name="RC_COMPLETION" value="/Users/cdl/IDrive-Sync/Dropbox/DLDInternet/rc/bash_completion.rc" />
+        <env name="RC_CMSV" value="server" />
+        <env name="AWS_ZONE" value="us-east-1a" />
+        <env name="AWS_KEYPAIR_NAME" value="curriculum-poc-admin" />
+        <env name="RC_ACCT" value="aws.curriculum-poc" />
+      </envs>
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+      <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+      <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+        <COVERAGE_PATTERN ENABLED="true">
+          <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+        </COVERAGE_PATTERN>
+      </EXTENSION>
+      <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />
+      <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/bin/chop" />
+      <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="--log-level info --repo-path /Users/cdl/IDrive-Sync/Dropbox/Amplify/ws/section-31/devops/chef --precedence rb,yaml --resources roles,cookbooks --roles '.*' --environments '.*' --cookbooks 'role,amplify-jenkins' -I 0" />
+      <RunnerSettings RunnerId="RubyDebugRunner" />
+      <RunnerSettings RunnerId="RubyRunner" />
+      <ConfigurationWrapper RunnerId="RubyDebugRunner" />
+      <ConfigurationWrapper RunnerId="RubyRunner" />
+      <method />
+    </configuration>
+    <configuration default="false" name="knife-chop" type="RubyRunConfigurationType" factoryName="Ruby" singleton="true" temporary="true">
+      <module name="knife-chop" />
+      <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+      <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$" />
+      <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
+      <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
+      <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
+      <envs />
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+      <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+      <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+        <COVERAGE_PATTERN ENABLED="true">
+          <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+        </COVERAGE_PATTERN>
+      </EXTENSION>
+      <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />
+      <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$USER_HOME$/.rvm/gems/ruby-1.9.3-p545@knife-chop/gems/chef-11.12.4/bin/knife" />
+      <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
+      <RunnerSettings RunnerId="RubyDebugRunner" />
+      <RunnerSettings RunnerId="RubyRunner" />
+      <ConfigurationWrapper RunnerId="RubyDebugRunner" />
+      <ConfigurationWrapper RunnerId="RubyRunner" />
+      <method />
+    </configuration>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p545 [knife-chop]" jdkType="RUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="addressable (v2.3.6, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="akami (v1.2.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="awesome_print (v1.2.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.6.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="chef (v11.12.4, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="chef-zero (v2.0.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="coderay (v1.1.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="colorize (v0.7.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="descendants_tracker (v0.0.4, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="em-winrm (v0.5.5, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="eventmachine (v1.0.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="excon (v0.31.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday (v0.9.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.9.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog (v1.20.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="formatador (v0.2.4, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="git (v1.2.6, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="github_api (v0.11.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gssapi (v1.0.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gyoku (v1.1.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="hashie (v2.1.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="highline (v1.6.21, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="httpclient (v2.3.4.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="httpi (v0.9.7, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="inifile (v2.0.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ipaddress (v0.8.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jeweler (v2.0.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jwt (v0.1.13, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="knife-ec2 (v0.8.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="knife-windows (v0.6.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="little-plugger (v1.1.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="logging (v1.8.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="method_source (v0.8.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types (v1.25.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.6.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mixlib-authentication (v1.3.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mixlib-cli (v1.5.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mixlib-config (v2.1.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mixlib-log (v1.6.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mixlib-shellout (v1.4.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.10.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_xml (v0.5.5, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multipart-post (v2.0.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="net-scp (v1.2.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="net-ssh (v2.9.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="net-ssh-gateway (v1.2.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="net-ssh-multi (v1.2.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.2.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nori (v1.1.5, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="oauth2 (v0.9.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ohai (v7.0.4, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="pry (v0.9.12.6, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rack (v1.5.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.3.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rdoc (v4.1.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rest-client (v1.6.7, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v2.14.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.14.8, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.14.5, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.14.6, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubyntlm (v0.1.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="savon (v0.9.5, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="slop (v3.5.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="systemu (v2.5.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unf (v0.1.4, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.6, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="uuidtools (v2.1.4, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="wasabi (v1.0.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="winrm (v1.1.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="yajl-ruby (v1.2.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+  </component>
+</module>
+

data/lib/chef/knife/chop/cookbook_upload.rb

@@ -34,7 +34,7 @@ end
 
 class ::Chef::Knife::CookbookUpload
   def run
-    raise StandardError.new("I was crafted from Chef::Knife::VERSION == '11.6.2'. Please verify that #{self.class.name}.run is still relevant in your version '#{Chef::VERSION}'!") unless Chef::VERSION.match(%r/^11\./)
+    raise StandardError.new("I was crafted from Chef::Knife::VERSION == '11.6.2'. Please verify that #{self.class.name}.run is still relevant in your version '#{Chef::VERSION}'!") unless Chef::VERSION.match(%r/^11\.(6|8|10|12)/)
     # Sanity check before we load anything from the server
     unless config[:all]
       if @name_args.empty?
@@ -44,7 +44,7 @@ class ::Chef::Knife::CookbookUpload
       end
     end
 
-    config[:cookbook_path] ||= Chef::Config[:cookbook_path]
+    config[:cookbook_path] ||= ::Chef::Config[:cookbook_path]
 
     if @name_args.empty? and ! config[:all]
       show_usage
@@ -53,13 +53,14 @@ class ::Chef::Knife::CookbookUpload
     end
 
     assert_environment_valid!
+    warn_about_cookbook_shadowing
     version_constraints_to_update = {}
     upload_failures = 0
     upload_ok = 0
 
     # Get a list of cookbooks and their versions from the server
     # to check for the existence of a cookbook's dependencies.
-    @server_side_cookbooks = Chef::CookbookVersion.list_all_versions
+    @server_side_cookbooks = ::Chef::CookbookVersion.list_all_versions
     justify_width = @server_side_cookbooks.map {|name| name.size}.max.to_i + 2
     if config[:all]
       cookbook_repo.load_cookbooks
@@ -74,7 +75,7 @@ class ::Chef::Knife::CookbookUpload
       rescue ::Chef::Exceptions::CookbookFrozen
         ui.warn("Not updating version constraints for some cookbooks in the environment as the cookbook is frozen.")
       end
-      ui.info("Uploaded all cookbooks.")
+      ui.step("Uploaded all cookbooks.")
     else
       if @name_args.empty?
         show_usage
@@ -82,7 +83,6 @@ class ::Chef::Knife::CookbookUpload
         exit 1
       end
 
-      @cookbooks_to_upload = nil
       cookbooks_to_upload.each do |cookbook_name, cookbook|
         cookbook.freeze_version if config[:freeze]
         begin
@@ -91,16 +91,27 @@ class ::Chef::Knife::CookbookUpload
           version_constraints_to_update[cookbook_name] = cookbook.version
         rescue ::Chef::Exceptions::CookbookNotFoundInRepo => e
           upload_failures += 1
-          ui.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
+          ui.fatal("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
           Log.debug(e)
           upload_failures += 1
         rescue ::Chef::Exceptions::CookbookFrozen
-          ui.warn("Not updating version constraints for #{cookbook_name} in the environment as the cookbook is frozen.")
+          ui.error("Not updating version constraints for #{cookbook_name} in the environment as the cookbook is frozen.")
           upload_failures += 1
         end
       end
 
       # BEGIN changes DLDInternet
+      # upload_failures += @name_args.length - @cookbooks_to_upload.length
+      #
+      # if upload_failures == 0
+      #   ui.info "Uploaded #{upload_ok} cookbook#{upload_ok > 1 ? "s" : ""}."
+      # elsif upload_failures > 0 && upload_ok > 0
+      #   ui.warn "Uploaded #{upload_ok} cookbook#{upload_ok > 1 ? "s" : ""} ok but #{upload_failures} " +
+      #               "cookbook#{upload_failures > 1 ? "s" : ""} upload failed."
+      # elsif upload_failures > 0 && upload_ok == 0
+      #   ui.error "Failed to upload #{upload_failures} cookbook#{upload_failures > 1 ? "s" : ""}."
+      #   exit 1
+      # end
       upload_skips = @name_args.length - @cookbooks_to_upload.length
 
       if upload_failures == 0
@@ -109,17 +120,17 @@ class ::Chef::Knife::CookbookUpload
         elsif upload_skips > 0 && upload_ok > 0
           ui.step "Uploaded #{upload_ok} #{'cookbook'.plural(upload_ok)} ok but #{upload_skips} #{'cookbook'.plural(upload_skips)} were not included."
         elsif upload_ok == 0
-          ui.error "Did not upload any cookbooks."
+          ui.fatal "Did not upload any cookbooks."
           exit 1
         end
       elsif upload_failures > 0 && upload_ok > 0
         if upload_skips == 0
-          ui.warn "Uploaded #{upload_ok} #{'cookbook'.plural(upload_ok)} ok but #{upload_failures} #{'cookbook'.plural(upload_failures)} failed upload."
+          ui.error "Uploaded #{upload_ok} #{'cookbook'.plural(upload_ok)} ok but #{upload_failures} #{'cookbook'.plural(upload_failures)} failed upload."
         elsif upload_skips > 0
-          ui.warn "Uploaded #{upload_ok} #{'cookbook'.plural(upload_ok)} ok but #{upload_skips} #{'cookbook'.plural(upload_skips)} were not included and #{upload_failures} #{'cookbook'.plural(upload_failures)} failed upload."
+          ui.error "Uploaded #{upload_ok} #{'cookbook'.plural(upload_ok)} ok but #{upload_skips} #{'cookbook'.plural(upload_skips)} were not included and #{upload_failures} #{'cookbook'.plural(upload_failures)} failed upload."
         end
       elsif upload_failures > 0 && upload_ok == 0
-        ui.error "Failed to upload #{upload_failures} #{'cookbook'.plural(upload_failures)}."
+        ui.fatal "Failed to upload #{upload_failures} #{'cookbook'.plural(upload_failures)}."
         exit 1
       end
 			# END Changes DLDInternet

data/lib/chef/knife/chop/data_bag_from_file.rb

@@ -1,21 +1,8 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Author:: Christo De Lange <opscode@dldinternet.com>
+# Monkey patch for Chef::Knife::DataBagFromFile
 #
+require 'chef/knife/data_bag_from_file'
 
 class ::Chef::Knife::DataBagFromFile
 
@@ -28,60 +15,25 @@ class ::Chef::Knife::DataBagFromFile
     @location = 'data_bags'
   end
 
-  ## --------------------------------------------------------------------------------------------------------------------
-  #def translate()
-  #  if config[:all] == true
-  #    translate_all_data_bags()
-  #  else
-  #    if @name_args[0].nil?
-  #      show_usage
-  #      ui.fatal("You must specify a file to translate")
-  #      exit 1
-  #    end
-  #
-  #    @data_bag = @name_args.shift
-  #    translate_data_bag_items(@data_bag, @name_args)
-  #  end
-  #end
-
-  ## --------------------------------------------------------------------------------------------------------------------
-  #def translate_data_bag_items(data_bag, items = nil)
-  #  items ||= find_all_data_bag_items(data_bag)
-  #  item_paths = normalize_item_paths(items)
-  #  item_paths.each do |item_path|
-  #    item = loader.load_from("#{data_bags_path}", data_bag, item_path)
-  #    dbag = ::Chef::DataBagItem.new
-  #    dbag.data_bag(data_bag)
-  #    dbag.raw_data = item
-  #    part = ::Chef::Part.new(dbag,location)
-  #    part.translate(@config)
-  #    resource = part.resource
-  #    output(format_for_display(resource)) if config[:print_after]
-  #    ui.info("Translated #{@rsrctype.capitalize} #{resource.name}")
-  #  end
-  #end
-  #
-  ## --------------------------------------------------------------------------------------------------------------------
-  #def data_bags_path
-  #  @data_bag_path ||= "data_bags"
-  #end
-  #
-  ## --------------------------------------------------------------------------------------------------------------------
-  #def translate_all_data_bags
-  #  loader.find_all_object_dirs("./#{data_bags_path}")
-  #end
-  #
-  ## --------------------------------------------------------------------------------------------------------------------
-  #def find_all_data_bag_items(data_bag)
-  #  loader.find_all_objects("./#{data_bags_path}/#{data_bag}")
-  #end
-  #
-  ## --------------------------------------------------------------------------------------------------------------------
-  #def translate_all_data_bags(args)
-  #  data_bags = args.empty? ? find_all_data_bags : [args.shift]
-  #  data_bags.each do |data_bag|
-  #    load_data_bag_items(data_bag)
-  #  end
-  #end
-
+  # DLDInternet monkey patch of original
+  def load_data_bag_items(data_bag, items = nil)
+    items ||= find_all_data_bag_items(data_bag)
+    item_paths = normalize_item_paths(items)
+    item_paths.each do |item_path|
+      item = loader.load_from("#{data_bags_path}", data_bag, item_path)
+      item = if use_encryption
+               secret = read_secret
+               Chef::EncryptedDataBagItem.encrypt_data_bag_item(item, secret)
+             else
+               item
+             end
+      dbag = Chef::DataBagItem.new
+      dbag.data_bag(data_bag)
+      dbag.raw_data = item
+      dbag.save
+      # BEGIN changes DLDInternet
+      ui.info("Updated data_bag_item[#{dbag.data_bag}::#{dbag.id}]")
+      # END changes DLDInternet
+    end
+  end
 end

data/lib/chef/knife/chop/environment_from_file.rb

@@ -1,20 +1,8 @@
 #
-# Author:: Stephen Delano (<stephen@opscode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Author:: Christo De Lange <opscode@dldinternet.com>
+# Monkey patch for Chef::Knife::EnvironmentFromFile
 #
+require 'chef/knife/environment_from_file'
 
 class ::Chef::Knife::EnvironmentFromFile
 
@@ -27,29 +15,14 @@ class ::Chef::Knife::EnvironmentFromFile
     @location = 'environments'
   end
 
-  # --------------------------------------------------------------------------------------------------------------------
+  # DLDInternet monkey patch of original
   def load_environment(env)
     updated = loader.load_from("environments", env)
     updated.save
     output(format_for_display(updated)) if config[:print_after]
+    # BEGIN DLDInternet change
     ui.step("Updated Environment #{updated.name}")
-  end
-
-  # --------------------------------------------------------------------------------------------------------------------
-  def run
-    if config[:all] == true
-      load_all_environments
-    else
-      if @name_args[0].nil?
-        show_usage
-        ui.fatal("You must specify a file to load")
-        exit 1
-      end
-
-      @name_args.each do |arg|
-        load_environment(arg)
-      end
-    end
+    # END DLDInternet change
   end
 
   # --------------------------------------------------------------------------------------------------------------------
@@ -73,7 +46,7 @@ class ::Chef::Knife::EnvironmentFromFile
     updated = loader.load_from("environments", env)
     updated.translate(@config,env)
     output(format_for_display(updated)) if config[:print_after]
-    ui.info("Translated Environment #{updated.name}")
+    ui.step("Translated Environment #{updated.name}")
   end
 
 end

data/lib/chef/knife/chop/role_from_file.rb

@@ -1,20 +1,8 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Author:: Christo De Lange <opscode@dldinternet.com>
+# Monkey patch for Chef::Knife::RoleFromFile
 #
+require 'chef/knife/role_from_file'
 
 class ::Chef::Knife::RoleFromFile
   # --------------------------------------------------------------------------------------------------------------------
@@ -34,9 +22,34 @@ class ::Chef::Knife::RoleFromFile
 
       output(format_for_display(updated)) if config[:print_after]
 
-      ui.step("Updated Role #{updated.name}!")
+      ui.info("Updated Role #{updated.name}!")
     end
   end
+
+  # --------------------------------------------------------------------------------------------------------------------
+  private
+  # --------------------------------------------------------------------------------------------------------------------
+
+  # --------------------------------------------------------------------------------------------------------------------
+  def translate_all_roles
+    roles = find_all_roles
+    if roles.empty?
+      ui.fatal("Unable to find any role files in '#{roles_path}'")
+      exit(1)
+    end
+    roles.each do |env|
+      translate_role(env)
+    end
+  end
+
+  # --------------------------------------------------------------------------------------------------------------------
+  def translate_role(env)
+    updated = loader.load_from("roles", env)
+    updated.translate(@config,env)
+    output(format_for_display(updated)) if config[:print_after]
+    ui.info("Translated Role #{updated.name}")
+  end
+
 end
 
 

data/lib/chef/knife/chop/ui.rb

@@ -35,7 +35,7 @@ class Chef
       #def define_log_methods( ui )
       def msg(message)
         caller = Kernel.caller[0]
-        match = %r/([-\.\/\(\)\w]+):(\d+)(?::in `(\w+)')?/o.match(caller)
+        match = caller.match(%r/([-\.\/\(\)\w]+):(\d+)(?::in `(\w+)')?/o)
         name = shifted(match[3])
         @logger.send(name, message)
       end
@@ -96,8 +96,8 @@ class Chef
           'error'
         when 'err'
           'error'
-        when 'info'
-          'debug'
+        # when 'info'
+        #   'debug'
         when 'debug'
           'trace'
         else

data/lib/chef/knife/chop_base.rb

@@ -151,6 +151,12 @@ class Chef
       # --------------------------------------------------------------------------------
       def parsePrecedence(v)
         @prec_max += 1
+        match = v.match(%r/^(json|rb|yaml)$/i)
+        unless match
+          m = "ERROR: Invalid precedence argument: #{v}. Accept only from this set: [json,rb,yaml]"
+          puts m
+          raise Exception.new(m)
+        end
         s = { v => @prec_max }
         match = v.match(%r/^(\S+):(\d+)$/)
         if match
@@ -650,7 +656,7 @@ class Chef
         set = {}
         chef = @config[:repo_path]
         raise ChopError.new "Oops! Where is the '#{chef}' directory? Also check cookbook path '#{@config[:cookbook_path]}'" unless File.directory?(chef)
-        abs = File.expand_path("#{chef}/#{path}")#.gsub(%r(^#{@chop_path}), '')
+        abs = File.realpath(File.expand_path("#{chef}/#{path}"))
         raise ChopError.new "Oops! Does 'chef/#{path}' directory exist?" unless File.directory?(abs)
         Dir.glob("#{abs}/*").each{ |f|
           match = File.basename(f).match(file_regex)

data/lib/chef/knife/chop_upload.rb

@@ -79,11 +79,34 @@ class Chef
         if args[:aggregate] and @use_knife_api
           subc.name_args << xtra if xtra != ''
           subc.name_args << set.map{ |name,file|
-            file
+            extname  = File.extname(file)
+            extname.gsub!(%r/^\./,'')
+            case extname
+              when /^yaml$/i
+                begin
+                  json = File.join(File::SEPARATOR, [ Dir::Tmpname.tmpdir, Dir::Tmpname.make_tmpname([name, '.json'], nil) ])
+                  @logger.debug("#{name}.#{extname} => #{json}")
+                  require 'json'
+                  require 'yaml'
+
+                  yaml_s = YAML::load(IO.read(file))
+                  json_s = JSON.dump(yaml_s)
+                  IO.write(json,json_s)
+                rescue Exception => e
+                  raise ChopError.new("#{e.class.name} - #{e.message}")
+                end
+                json
+              when /^(rb|json)$/
+                # noop
+                file
+              else
+                raise ChopError.new("'#{extname}' files are not supported!")
+            end
           }
           subc.name_args.flatten!
           #cmd = callCmdProc(filp, cmd, set.map{|name,file| name}.to_s, set.map{|name,file| file}.join(' '))
           @logger.info "#{cmd} #{set.map{|name,file| file}.ai} ... "
+          @logger.info "#{cmd} #{subc.name_args.ai} ... "
           unless @config[:dry_run]
             begin
               subc.run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-chop
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.6.7
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -139,7 +139,7 @@ dependencies:
         version: 11.10.0
     - - ~>
       - !ruby/object:Gem::Version
-        version: '11.10'
+        version: '11.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ dependencies:
         version: 11.10.0
     - - ~>
       - !ruby/object:Gem::Version
-        version: '11.10'
+        version: '11.12'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
@@ -190,40 +190,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.8.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.8.8
 description: Knife plugin to assist with the upload and sync of Chef server assets
   like roles, environments and cookbooks allowing for multiple parts to be uploaded
   at once to multiple environments. Resources can be matched with regular expressions.
@@ -244,6 +210,7 @@ files:
 - VERSION
 - bin/chop
 - knife-chop.gemspec
+- knife-chop.iml
 - lib/chef/knife/chop/chef_data_bag_item.rb
 - lib/chef/knife/chop/chef_environment.rb
 - lib/chef/knife/chop/chef_knife.rb