spaux 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c2a52a8929cfd462d77814d9b080ca8e282d740
-  data.tar.gz: 5594916e7f5c25b2e54d92dd885a67cc0aa4d14a
+  metadata.gz: 4ca6cdb0701d57bb9e1e6757409f445751a7be00
+  data.tar.gz: ebc351a25943fb1ac5a927d6ef349404dd9eb3cf
 SHA512:
-  metadata.gz: c310e8a8abe5b70067a267b53c90f3105d32bdde096cb8c6dc788b677b0b1ec95c55558416b5028c828c7421a1abe47b638d7d1cccd4a3d5b12f8c079be2a662
-  data.tar.gz: 923c4039a0bbd5f4f0c40840495225e08114830130e4ebdea52a9d71edbf5ad4ec417f58f7afb336c01e8cdc51abfe29d2a633919807c8c77b2895d61bb33411
+  metadata.gz: 49a94afda451ae1327d989492ccf24f26e8b7edd2798f2f6e97b13332b0688f02f260ac4089f8678a705866a22597871237a761312cbd7045b2b924a1de12b86
+  data.tar.gz: c01509c2736bd400bb0c878f967b67468ebac7995ca09f3419232bfa0f1c4b335c2eb0dba58d2cea3da37dc156e2250e01782e3815513441f5fe16526f053c68

data/examples/knife_minimal.rb

@@ -0,0 +1,2 @@
+current_dir = File.dirname(__FILE__)
+cookbook_path [current_dir]

data/lib/spaux/chef/client.rb

@@ -51,6 +51,14 @@ class Spaux
         argv = []
         super
       end
+
+      def run_application
+        begin
+          super
+        rescue SystemExit => e
+          # just ignore chef-client exit
+        end
+      end
     end
   end
 end

data/lib/spaux/chef/knife.rb

@@ -0,0 +1,52 @@
+require 'chef/application/knife'
+require 'fileutils'
+require 'spaux/chef/knife_monkey_patches'
+
+class Spaux
+  class Chef
+    class Knife < ::Chef::Application::Knife
+
+      DEFAULT_KNIFE_CONFIG = {
+        config_file: {
+          flags: %w(--config -c),
+          value: ::File.join('@work_dir', 'knife.rb')
+        }
+      }
+
+      attr_accessor :work_dir
+      attr_accessor :args
+
+      def initialize(work_dir, args)
+        @work_dir = work_dir
+        @args = args
+
+        DEFAULT_KNIFE_CONFIG.each do |_,v|
+          v[:value].is_a?(String) && v[:value].gsub!(/@work_dir/, @work_dir)
+        end
+
+        cf_flags = DEFAULT_KNIFE_CONFIG[:config_file][:flags]
+        unless @args.include?(cf_flags.first) || @args.include?(cf_flags.last)
+          @args << DEFAULT_KNIFE_CONFIG[:config_file][:flags].first
+          @args << DEFAULT_KNIFE_CONFIG[:config_file][:value]
+        end
+
+        config_file = DEFAULT_KNIFE_CONFIG[:config_file][:value]
+        FileUtils.touch config_file
+      end
+
+      def run
+        Mixlib::Log::Formatter.show_time = false
+        quiet_traps
+        # I'm not sure why I have to do this if this class is child
+        # of Chef::Application::Knife, so options should be set already
+        knife = ::Chef::Application::Knife.new
+        options = knife.options
+        begin
+          ::Chef::Knife.run(@args, options)
+        rescue SystemExit => e
+          # just ignore the exit of knife tool
+        end
+      end
+    end
+  end
+end

data/lib/spaux/chef/knife_monkey_patches.rb

@@ -0,0 +1,27 @@
+class Chef
+  class Knife
+   def configure_spaux
+     config.merge!(Spaux::default_knife_config)
+   end
+   def self.run(args, options={})
+      # Fallback debug logging. Normally the logger isn't configured until we
+      # read the config, but this means any logging that happens before the
+      # config file is read may be lost. If the KNIFE_DEBUG variable is set, we
+      # setup the logger for debug logging to stderr immediately to catch info
+      # from early in the setup process.
+      if ENV['KNIFE_DEBUG']
+        Chef::Log.init($stderr)
+        Chef::Log.level(:debug)
+      end
+
+      load_commands
+      subcommand_class = subcommand_class_from(args)
+      subcommand_class.options = options.merge!(subcommand_class.options)
+      subcommand_class.load_deps
+      instance = subcommand_class.new(args)
+      instance.configure_spaux
+      instance.configure_chef
+      instance.run_with_pretty_exceptions
+    end
+  end
+end

data/lib/spaux/cli.rb

@@ -35,22 +35,31 @@ class Spaux
         ::File.write(options[:file], key)
       end
     end
+    desc 'knife', 'Run Chef knife in Spaux context'
+    option :dir, :desc => 'Working directory', :banner => 'DIRECTORY'
+    option :current, :type => :boolean, :default => true,
+      :desc => 'Create and/or use a working directory in the current directory'
+    def knife(*args)
+      work_dir = get_work_dir(options)
+      knife = Spaux::Chef::Knife.new(work_dir, args)
+      knife.run
+    end
 
-#    private
-#    def get_work_dir(options)
-#      dir = options[:dir]
-#      current = options[:current]
-#      if !dir
-#        work_dir = if ENV['SPAUX_HOME']
-#          ENV['SPAUX_HOME']
-#        elsif current
-#          ::File.join(ENV['PWD'], 'current')
-#        else
-#          Dir.mktmpdir
-#        end
-#      else
-#        work_dir = dir
-#      end
-#    end
+    private
+    def get_work_dir(options)
+      dir = options[:dir]
+      current = options[:current]
+      if !dir
+        work_dir = if ENV['SPAUX_HOME']
+          ENV['SPAUX_HOME']
+        elsif current
+          ::File.join(ENV['PWD'], 'current')
+        else
+          Dir.mktmpdir
+        end
+      else
+        work_dir = dir
+      end
+    end
   end
 end

data/lib/spaux/defaults/knife.rb

@@ -0,0 +1,6 @@
+current_dir = File.dirname(__FILE__)
+node_name                "spaux"
+client_key               ::File.join(current_dir, 'spaux.pem')
+chef_server_url          "https://api.opscode.com/organizations/spaux"
+cookbook_path            [current_dir]
+ssl_verify_mode          :verify_peer

data/lib/spaux/version.rb

@@ -1,3 +1,3 @@
 class Spaux
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/spaux.rb

@@ -1,6 +1,13 @@
 require 'spaux/version'
 require 'spaux/cli'
 require 'spaux/chef/client'
+require 'spaux/chef/knife'
 
 class Spaux
+  def self.default_knife_config
+    lib_dir = ::File.expand_path(::File::join(__FILE__, '..'))
+    knife_rb = ::File::join(lib_dir, 'spaux', 'defaults', 'knife.rb')
+    ::Chef::Config.from_string(::File.read(knife_rb), knife_rb)
+    ::Chef::Config.configuration
+  end
 end

data/spec/spaux_spec.rb

@@ -19,11 +19,16 @@ describe Spaux::Chef::Client do
 end
 
 #describe Spaux::Chef::Key
+#describe Spaux::Chef::Knife
 
 describe Spaux::CLI do
   describe '#converge' do
-    xit 'prints "chef client" in stdout' do
-      expect { Spaux::CLI.new.converge }.to output(/Starting Chef Client/).to_stdout
+    it 'prints "chef client" in stdout' do
+      begin
+        spaux = Spaux::CLI.new
+      rescue SystemExit
+        expect { spaux.converge }.to output(/Starting Chef Client/).to_stdout
+      end
     end
   end
   describe '#savekey' do
@@ -31,4 +36,13 @@ describe Spaux::CLI do
       expect { Spaux::CLI.new.savekey }.to output(/^-----BEGIN RSA PRIVATE KEY-----/).to_stdout
     end
   end
+  describe '#knife' do
+    it 'prints expect knife output in stdout' do
+      begin
+        spaux = Spaux::CLI.new
+      rescue SystemExit
+        expect { spaux.knife("help", "list") }.to output(/help topics/).to_stdout
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spaux
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Miguel Landaeta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -180,11 +180,15 @@ files:
 - bin/spaux
 - examples/attributes.json
 - examples/knife.rb
+- examples/knife_minimal.rb
 - lib/spaux.rb
 - lib/spaux/chef/client.rb
 - lib/spaux/chef/key.rb
+- lib/spaux/chef/knife.rb
+- lib/spaux/chef/knife_monkey_patches.rb
 - lib/spaux/chef/monkey_patches.rb
 - lib/spaux/cli.rb
+- lib/spaux/defaults/knife.rb
 - lib/spaux/version.rb
 - spaux.gemspec
 - spec/spaux_spec.rb