homeseed 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2JiOWJlZmM3YTgzZWI4MDg5Y2VlYjVjNWFkMTBmZTNiYjRhMGY5MA==
+    NGY0MDNlYmJkMzEzNTQxZWRmMWRkODlhZjAxNDgzYjJiOTIwMzA1NQ==
   data.tar.gz: !binary |-
-    MjY1ZTJlNTAyM2I1MWI0NDE3NWMwNDRlYzkxMmNhYzk2YTNkM2JlZA==
+    MDQxZjQ1MDViYTEzNzc4NTJlYzgyYmQ3NzVhZDliN2FjYTJhMDQwMQ==
 SHA512:
   metadata.gz: !binary |-
-    NDA1ZWVmMDdiMDFhY2JiMWZlNWJlMGNmZGE1NWFkNDM0YWI2ZmM2OWFkNWNm
-    YmEyZjAyZGYzYThkMDQ5MjUwMTJmMGU5ZmQ0NTdiMDdiZDQ0MGE1YWY2Njhk
-    NzFiOGYyYzVlZmVjZDQ4NjAyOWRlYmNmNWRlODVjZGEzNmRmMTI=
+    NmIwODQwMDg5ZDMyZDhhZmIxNGRlMTFkNTdmNTc3YTkwZjA3NzY2ZThkZDEy
+    YTJkZDllMTY5YzgwMDc5MmZkZWM0OWY4M2NlZGZlY2I0Njg0MTUzZjMwZDVj
+    MTM2MDk1NDNmYWU4ZDhlMjlmNzRlMjQxNzlmYTdjMGQyYWEwNTk=
   data.tar.gz: !binary |-
-    YjM5ZTliMTllYzY2Mzk0NDU0ZDQwYzI3OGY1ZWQ0ODRmMzdiMjNhN2E0Y2Y1
-    ZmRhNTlmMWU1NmJkMjIwYjM0ZTk3Y2I3OTVmMDQ4ZDhmNDc4NzhhOWU4Njlm
-    NjU2NWEyNDlkZGViZTViYThhNDJiM2VkYTFhYWZmYmM4ZTkzNGM=
+    Y2M3OWRiMGZjNmQ0YzRlM2Q4NTlkNzM3MDQ5YTY5MDdiNDAyZDhmZDQyNTI5
+    OTE1MTg5NGE1NTFjNWY1MWIxMzRiM2FlMmUyMGY2NGYxZmM1YWFkN2Q0MGU0
+    ODdkNTQ2OTJjYTVjOGM5MGVmNTlhYzJlODVlZGYwMDUwMjkzMDE=

data/bin/homeseed

@@ -5,21 +5,23 @@ require 'thor'
 
 module Homeseed
   class HomeseedCliApp < Thor
-    desc 'exec [-e <command> or -f <files>] [-u <user>]',
+    desc 'exec [-e <command> or -f <files>] [-u <user>] [-p <has_password>]',
       'executes bash login session(s) on remote servers to run inline bash commands or bash commands from yml file'
     method_option :servers, required: true, aliases: '-s', desc: 'ssh hostname(s); csv if multiple'
     method_option :command, aliases: '-e', desc: 'bash command to exec'
     method_option :files, aliases: '-f', desc: 'yml bash command file(s) to exec'
     method_option :user, aliases: '-u', desc: 'ssh username', default: ENV['USER']
+    method_option :has_password, aliases: '-p', type: :boolean, default: false, desc: 'connection uses password; no ssh keys'
     def exec
       connection = Homeseed::Connection.new options
       connection.ssh_exec
     end
 
-    desc 'plant [-u <user>]',
+    desc 'plant [-u <user>] [-p <has_password>]',
       'installs homeshick and then dot profile based on localhost $HOME/.homeseed.yml'
-    method_option :servers, required: true, aliases: '-s', desc: 'ssh hostname(s); csv if multiple'
+    method_option :servers, required: true, aliases: '-s', desc: 'ssh hostname(s) or localhost; csv if multiple'
     method_option :user, aliases: '-u', desc: 'ssh username', default: ENV['USER']
+    method_option :has_password, aliases: '-p', type: :boolean, default: false, desc: 'connection uses password; no ssh keys'
     def plant
       config_files = %w(homeshick-prep.yml homeshick-install.yml homeshick-source.yml)
       files = config_files.map { |file| File.expand_path("../../config/#{file}", __FILE__) }
@@ -28,10 +30,11 @@ module Homeseed
       connection.ssh_exec
     end
 
-    desc 'update [-u <user>]',
+    desc 'update [-u <user>] [-p <has_password>]',
       'updates dot profile based on localhost $HOME/.homeup.yml'
     method_option :servers, required: true, aliases: '-s', desc: 'ssh hostname(s); csv if multiple'
     method_option :user, aliases: '-u', desc: 'ssh username', default: ENV['USER']
+    method_option :has_password, aliases: '-p', type: :boolean, default: false, desc: 'connection uses password; no ssh keys'
     def update
       config_files = %w(homeshick-source.yml)
       files = config_files.map { |file| File.expand_path("../../config/#{file}", __FILE__) }
@@ -40,12 +43,13 @@ module Homeseed
       connection.ssh_exec
     end
 
-    desc 'upload [-f <upload_files>] [-p <remote_path>] [-u <user>]',
+    desc 'upload [-f <upload_files>] [-r <remote_path>] [-u <user>] [-p <has_password>]',
       'scp uploads file(s) to remote servers'
     method_option :servers, required: true, aliases: '-s', desc: 'ssh hostname(s); csv if multiple'
     method_option :upload_files, aliases: '-f', desc: 'file(s) to upload to server(s)'
-    method_option :remote_path, aliases: '-p', desc: 'path to upload to server(s)'
+    method_option :remote_path, aliases: '-r', desc: 'path to upload to server(s)'
     method_option :user, aliases: '-u', desc: 'ssh username', default: ENV['USER']
+    method_option :has_password, aliases: '-p', type: :boolean, default: false, desc: 'connection uses password; no ssh keys'
     def upload
       connection = Homeseed::Connection.new options
       connection.scp_upload

data/homeseed.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'net-ssh', '~> 2.6'
   spec.add_dependency 'net-scp', '~> 1.1'
   spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'highline', '~> 1.6'
 end

data/lib/homeseed/connection.rb

@@ -0,0 +1,117 @@
+module Homeseed
+  class Connection
+    include Logging
+
+    def initialize(params={})
+      raise 'servers and/or user not specified' unless params[:servers] and params[:user]
+      @servers = params[:servers].split(',')
+      @user = params[:user]
+
+      if params[:has_password]
+        cli = HighLine.new
+        @password = cli.ask("Enter password: ") { |q| q.echo = false }
+      else
+        @password = params[:password] || ''
+      end
+
+      if params[:logger]
+        @logger = params[:logger]
+      else
+        logger.level = params[:logger_level] || Logger::INFO
+      end
+
+      if params[:command]
+        @flat_commands = params[:command]
+      elsif params[:files]
+        @files = params[:files].split(',')
+        @flat_commands = ''
+        @files.each do |file|
+          yml_commands = YAML.load_file(file)
+          commands = []
+          self.process_hash(commands, '', yml_commands)
+          @flat_commands += commands.join('; ') + ';'
+        end
+      elsif params[:upload_files]
+        @remote_path = params[:remote_path] || '/tmp/'
+        @upload_files = params[:upload_files].split(',')
+      else
+        raise 'ERROR command, files or upload_files not specified'
+      end
+    end
+
+    def process_hash(commands, current_key, obj)
+      if obj.is_a?(Hash)
+        obj.each do |new_key, value|
+          combined_key = [current_key, new_key].delete_if { |k| k == '' }.join(" ")
+          process_hash(commands, combined_key, value)
+        end
+      else obj.is_a?(Array)
+        obj.each do |value|
+          combined_key = [current_key, value].delete_if { |k| k == '' }.join(" ")
+          commands << combined_key
+        end
+      end
+    end
+
+    def ssh_exec
+      Hash[@servers.map do |server|
+        logger.info "ssh #{@user}@#{server} exec: #{@flat_commands}"
+
+        exit_status = nil
+        exit_signal = nil
+
+        Net::SSH.start(server, @user, password: @password) do |ssh|
+          ssh.open_channel do |channel|
+            channel.exec("bash -l") do |ch,success|
+              ch.send_data "#{@flat_commands}\n"
+              ch.on_data do |c,data|
+                data_lines = data.split(/[\r,\n]/)
+                data_lines.each do |data_line|
+                  logger.info data_line unless data_line == ''
+                end
+              end
+
+              ch.on_extended_data do |c,type,data|
+                data_lines = data.split(/[\r,\n]/)
+                data_lines.each do |data_line|
+                  unless data_line == ''
+                    if data_line.match(/error|failed/i)
+                      logger.error data_line
+                    else
+                      logger.info data_line
+                    end
+                  end
+                end
+              end
+
+              ch.on_request("exit-status") do |c,data|
+                exit_status = data.read_long
+              end
+
+              ch.on_request("exit-signal") do |c,data|
+                exit_signal = data.read_long
+              end
+
+              ch.send_data "exit\n"
+            end
+          end
+        end
+        [server, { exit_status: exit_status, exit_signal: exit_signal }]
+      end]
+    end
+
+    def scp_upload
+      @servers.each do |server|
+        @upload_files.each do |upload_file|
+          logger.info "starting scp #{upload_file} #{@user}@#{server}:#{@remote_path}"
+          begin
+            Net::SCP.start(server, @user) { |scp| scp.upload!(upload_file, @remote_path) }
+            logger.info "finished scp #{upload_file} #{@user}@#{server}:#{@remote_path}"
+          rescue => err
+            logger.error "scp FAILED #{err}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/homeseed/version.rb

@@ -1,3 +1,3 @@
 module Homeseed
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/homeseed.rb

@@ -1,111 +1,8 @@
-require "homeseed/version"
 require 'logger'
 require 'net/ssh'
 require 'net/scp'
 require 'yaml'
+require 'highline/import'
 require_relative './logging'
 
-module Homeseed
-  class Connection
-    include Logging
-
-    def initialize(params={})
-      raise 'servers and/or user not specified' unless params[:servers] and params[:user]
-      @servers = params[:servers].split(',')
-      @user = params[:user]
-      @password = params[:password] || ''
-
-      if params[:logger]
-        @logger = params[:logger]
-      else
-        logger.level = params[:logger_level] || Logger::INFO
-      end
-
-      if params[:command]
-        @flat_commands = params[:command]
-      elsif params[:files]
-        @files = params[:files].split(',')
-        @flat_commands = ''
-        @files.each do |file|
-          yml_commands = YAML.load_file(file)
-          commands = []
-          self.process_hash(commands, '', yml_commands)
-          @flat_commands += commands.join('; ') + ';'
-        end
-      elsif params[:upload_files]
-        @remote_path = params[:remote_path] || '/tmp/'
-        @upload_files = params[:upload_files].split(',')
-      else
-        raise 'ERROR command, files or upload_files not specified'
-      end
-    end
-
-    def process_hash(commands, current_key, obj)
-      if obj.is_a?(Hash)
-        obj.each do |new_key, value|
-          combined_key = [current_key, new_key].delete_if { |k| k == '' }.join(" ")
-          process_hash(commands, combined_key, value)
-        end
-      else obj.is_a?(Array)
-        obj.each do |value|
-          combined_key = [current_key, value].delete_if { |k| k == '' }.join(" ")
-          commands << combined_key
-        end
-      end
-    end
-
-    def ssh_exec
-      Hash[@servers.map do |server|
-        logger.info "ssh #{@user}@#{server} exec: #{@flat_commands}"
-
-        exit_status = 0
-        Net::SSH.start(server, @user, password: @password) do |ssh|
-          ssh.open_channel do |channel|
-            channel.exec("bash -l") do |ch,success|
-              ch.send_data "#{@flat_commands}\n"
-              ch.on_data do |c,data|
-                data_lines = data.split(/[\r,\n]/)
-                data_lines.each do |data_line|
-                  logger.info data_line unless data_line == ''
-                end
-              end
-
-              ch.on_extended_data do |c,type,data|
-                data_lines = data.split(/[\r,\n]/)
-                data_lines.each do |data_line|
-                  unless data_line == ''
-                    if data_line.match(/error|failed/i)
-                      logger.error data_line
-                    else
-                      logger.info data_line
-                    end
-                  end
-                end
-              end
-
-              ch.on_request("exit-status") do |c,data|
-                exit_status = data.read_long
-              end
-              ch.send_data "exit\n"
-            end
-          end
-        end
-        [server, { exit_status: exit_status }]
-      end]
-    end
-
-    def scp_upload
-      @servers.each do |server|
-        @upload_files.each do |upload_file|
-          logger.info "starting scp #{upload_file} #{@user}@#{server}:#{@remote_path}"
-          begin
-            Net::SCP.start(server, @user) { |scp| scp.upload!(upload_file, @remote_path) }
-            logger.info "finished scp #{upload_file} #{@user}@#{server}:#{@remote_path}"
-          rescue => err
-            logger.error "scp FAILED #{err}"
-          end
-        end
-      end
-    end
-  end
-end
+Dir["./lib/homeseed/*.rb"].sort.each { |f| require f }

data/lib/logging.rb

@@ -3,18 +3,24 @@ module Logging
     @logger ||= Logging.logger_for(self.class.name)
   end
 
-  # Use a hash class-ivar to cache a unique Logger per class:
-  @loggers = {}
+  @@global_level = Logger::INFO
+  @@loggers = {}
 
   class << self
     def logger_for(classname)
-      @loggers[classname] ||= configure_logger_for(classname)
+      @@loggers[classname] ||= configure_logger_for(classname)
     end
 
     def configure_logger_for(classname)
       logger = Logger.new(STDOUT)
+      logger.level = @@global_level
       logger.progname = classname
       logger
     end
+
+    def global_level=(level)
+      @@global_level = level
+      @@loggers.each { |classname,logger| logger.level = level }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homeseed
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - rbuchss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: Flattens then SSH execs commands on remote server
 email:
 - rbuchss@gmail.com
@@ -100,6 +114,7 @@ files:
 - config/rbuchss-setup-linux.yml
 - homeseed.gemspec
 - lib/homeseed.rb
+- lib/homeseed/connection.rb
 - lib/homeseed/version.rb
 - lib/logging.rb
 homepage: http://github.com/rbuchss/homeseed