spaux 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21a17179cba89adae20a6335220adab158e77f58
-  data.tar.gz: b37a9735d3b5c9fa7a0a53f6c8b4dbf3dcf46493
+  metadata.gz: 466f15ee386ce8a4828c78c2ddd79d237abba028
+  data.tar.gz: 33f63a81f23e5b16a956be021578a8cf104d044a
 SHA512:
-  metadata.gz: 2dbdb25593bf919cff9dca2e599d26528f8ac75f518ebaa859477ac8ec9b83feb7eb938b4b2468464bdfac119d08f794ac7130eab4c028cbee1e1c23c4e80db4
-  data.tar.gz: 576e9fcb7f72380d0cd7000e5ed290aed370cf950656cce9bbb6562ded97b58193b1ecd534d32d5f8b13d872bb8a2b0b67758afba731d04ec70038e492764a26
+  metadata.gz: 490e90f25221c3c7e3d36527ecc7a92b542253912aafa2958d09fab7a4d568f326032101f00fb9c83387e4ec890257bec5888c6fb4a49c4c92a8f2258ac8f0df
+  data.tar.gz: c73694ab180b60e7f51f367e3004b4057345aafc5500471e2ec721810d4d830d8ec73b5d89086f2654fb9e7825914719a3d767390419227c254bae4a1bd754eb

data/examples/attributes2.json

@@ -0,0 +1,30 @@
+{
+  "spaux":{
+    "machine":{
+      "action":"converge",
+      "key_name":"fancy",
+      "name":"shangrila",
+      "runlist":[
+        "ufw",
+        "hostname",
+        "apt",
+        "git",
+        "users::sysadmins",
+        "sudo"
+      ]
+    },
+    "digital_ocean":{
+      "bootstrap_options":{
+        "flavor_name":"512MB"
+      }
+    },
+    "conf_mgmt":{
+      "chef":{
+        "endpoint":"https://api.qirtaiba.org/organizations/xanadu",
+        "options":{
+          "client_name":"xanadu"
+        }
+      }
+    }
+  }
+}

data/examples/chef.rb

@@ -0,0 +1,4 @@
+{
+  :chef_server_url => "https://api.qirtaiba.org/organizations/xanadu",
+  :node_name => "xanadu"
+}

data/examples/spaux.rb

@@ -0,0 +1 @@
+{:chef_private_key_gist_id =>"513395c90bfe499fdc55"}

data/lib/spaux/chef/client.rb

@@ -19,12 +19,11 @@ class Spaux
         @config.merge! default_chef_config.merge(chef_config)
 
         default_spaux_config = Spaux::default_spaux_config
-
         @spaux_config = default_spaux_config.merge(spaux_config)
-        #if !@spaux_config.eql?(default_spaux_config)
-          #trigger a reevalutation of the private key
 
-        @config[:raw_key] = Spaux::Chef::RawKey
+        @config[:raw_key] = Spaux::Chef::Key.new(@spaux_config).raw_key
+        # ugly hack but better than another options...
+        redefine_chef_http_authenticator @config[:raw_key]
 
         FileUtils.touch @config[:config_file]
         FileUtils.touch @config[:client_key]
@@ -51,6 +50,15 @@ class Spaux
           # just ignore chef-client exit
         end
       end
+
+      private
+      def redefine_chef_http_authenticator(key)
+        ::Chef::HTTP::Authenticator.send(:define_method,
+          'load_signing_key') do |signing_key_filename, raw_key|
+          @raw_key = key
+          @key = OpenSSL::PKey::RSA.new(@raw_key)
+        end
+      end
     end
   end
 end

data/lib/spaux/chef/key.rb

@@ -10,7 +10,7 @@ class Spaux
 
       def initialize(config={})
         @work_dir = ::File.join(ENV['PWD'], 'current')
-        @config = config.merge(default_spaux_config)
+        @config = default_spaux_config.merge(config)
         @raw_key ||= get_raw_key
       end
 
@@ -64,5 +64,3 @@ class Spaux
     end
   end
 end
-
-Spaux::Chef::RawKey = Spaux::Chef::Key.new.raw_key

data/lib/spaux/chef/monkey_patches/client.rb

@@ -1,21 +1,6 @@
 require 'chef'
 require 'chef/application/client'
 
-class Chef
-  class HTTP
-    class Authenticator
-      def load_signing_key(key_file, raw_key = nil)
-        @raw_key = Spaux::Chef::RawKey
-        @key = OpenSSL::PKey::RSA.new(@raw_key)
-      rescue OpenSSL::PKey::RSAError
-        msg = "The file #{key_file} or :raw_key option does not contain a correctly formatted private key.\n"
-        msg << "The key file should begin with '-----BEGIN RSA PRIVATE KEY-----' and end with '-----END RSA PRIVATE KEY-----'"
-        raise Chef::Exceptions::InvalidPrivateKey, msg
-      end
-    end
-  end
-end
-
 class ChefVault
   class Item < Chef::DataBagItem
     def secret

data/lib/spaux/cli/ssh_subcommand.rb

@@ -0,0 +1,52 @@
+require 'thor'
+require 'chef/http/authenticator'
+require 'pry'
+require 'tempfile'
+
+class Spaux
+  class CLI < Thor
+    class SSHSubcommand
+      def initialize(*args)
+        chef_config = args.shift  || {}
+        spaux_config = args.shift || {}
+
+        default_chef_config = Spaux::default_chef_config(:client)
+        @config = {}
+        @config.merge! default_chef_config.merge(chef_config)
+
+        default_spaux_config = Spaux::default_spaux_config
+        @spaux_config = default_spaux_config.merge(spaux_config)
+
+        @config[:raw_key] = Spaux::Chef::Key.new(@spaux_config).raw_key
+        redefine_chef_http_authenticator @config[:raw_key]
+      end
+
+      def run(nodename, options={})
+        begin
+          node = ::Chef::Node.load(nodename)
+        rescue Net::HTTPServerException => e
+          not_found_msg = nodename + ' node could not be found in the server'
+          STDERR.puts not_found_msg if e.response.code.eql?('404')
+        end
+        node_ipaddress = node[:ipaddress]
+        node_rsa_public_key = node[:keys][:ssh][:host_rsa_public]
+        # write a gem to do this instead of shelling out
+        node_key = `ssh-keyscan -H #{node_ipaddress} 2>/dev/null`
+        tmp_known_hosts_file = Tempfile.new('tmp_known_hosts_file')
+        tmp_known_hosts_file.write(node_key)
+        tmp_known_hosts_file.flush
+        ssh_cmd = "ssh -o UserKnownHostsFile="
+        exec(ssh_cmd + "#{tmp_known_hosts_file.path} #{node_ipaddress}")
+      end
+
+      private
+      def redefine_chef_http_authenticator(key)
+        ::Chef::HTTP::Authenticator.send(:define_method,
+          'load_signing_key') do |signing_key_filename, raw_key|
+          @raw_key = key
+          @key = OpenSSL::PKey::RSA.new(@raw_key)
+        end
+      end
+    end
+  end
+end

data/lib/spaux/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'spaux'
+require 'spaux/cli/ssh_subcommand'
 require 'tmpdir'
 require 'fileutils'
 
@@ -9,17 +10,28 @@ class Spaux
     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'
+    option :config, :desc => 'Configuration file to use with chef-client',
+      :aliases => :c
+    option :spaux_config, :desc => 'Configuration file to use with spaux',
+      :aliases => :s
     def converge
       work_dir = get_work_dir(options)
       FileUtils.mkdir_p work_dir
 
-      client = Spaux::Chef::Client.new(work_dir)
-      client.run
+      begin
+        chef_config = parse_config_file(options[:config]) if options[:config]
+        spaux_config = parse_config_file(options[:spaux_config]) if options[:spaux_config]
+        client = Spaux::Chef::Client.new(work_dir, chef_config, spaux_config)
+        client.run
+      rescue Errno::ENOENT => e
+        ssh_message = 'error: You need to create a ssh keypair'
+        STDERR.puts ssh_message if e.message.match(/id_rsa/)
+      end
     end
     desc 'savekey', 'Show/save private chef key'
     option :file, :type => :string
     def savekey
-      key = Spaux::Chef::RawKey
+      key = Spaux::Chef::Key.new.raw_key
       if !options[:file]
         puts key
       else
@@ -35,6 +47,11 @@ class Spaux
       knife = Spaux::Chef::Knife.new(work_dir, args)
       knife.run
     end
+    desc 'ssh', 'Connect via ssh to a node'
+    def ssh(nodename)
+      ssh_cmd = Spaux::CLI::SSHSubcommand.new
+      ssh_cmd.run(nodename, options)
+    end
 
     private
     def get_work_dir(options)
@@ -52,5 +69,13 @@ class Spaux
         work_dir = dir
       end
     end
+    def parse_config_file(file)
+      begin
+        eval(IO.read(file))
+      rescue Errno::ENOENT => e
+        puts e.message
+        {}
+      end
+    end
   end
 end

data/lib/spaux/version.rb

@@ -1,3 +1,3 @@
 class Spaux
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/spec/spaux_spec.rb

@@ -20,6 +20,7 @@ end
 
 #describe Spaux::Chef::Key
 #describe Spaux::Chef::Knife
+#describe Spaux::CLI::SSHSubcommand
 
 describe Spaux::CLI do
   describe '#converge' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spaux
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Miguel Landaeta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -179,8 +179,11 @@ files:
 - Rakefile
 - bin/spaux
 - examples/attributes.json
+- examples/attributes2.json
+- examples/chef.rb
 - examples/knife.rb
 - examples/knife_minimal.rb
+- examples/spaux.rb
 - lib/spaux.rb
 - lib/spaux/chef/client.rb
 - lib/spaux/chef/default/client.rb
@@ -190,6 +193,7 @@ files:
 - lib/spaux/chef/monkey_patches/client.rb
 - lib/spaux/chef/monkey_patches/knife.rb
 - lib/spaux/cli.rb
+- lib/spaux/cli/ssh_subcommand.rb
 - lib/spaux/config.rb
 - lib/spaux/version.rb
 - spaux.gemspec