homeseed 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTkzMmRlMmM3NjA0ODczNDhmMTA1NDk4ZTk0NmUwZjI4NTJjMThkNg==
+    ZTJiMDg0ZDU5ZTkzM2IwN2EyNTI3ODI0ZTFkNThhMzMwNGNhYjgxMg==
   data.tar.gz: !binary |-
-    M2JiMzk4NDk0MWI4MGIzMWQ0NDgxZmVlZGU3Y2NmYTI0ZmEwYTQ0Zg==
+    ODYxNWY2MDFhZDhiMTQ4MzVhYTA4ZGFjZDM2MTQ0NTMxNmY0MWQ3NA==
 SHA512:
   metadata.gz: !binary |-
-    MDNmOTJhMjgyODRlZDUwZTg4N2FlNzI4ZTQ3MWU3MjNkY2FhOThkZGIyNjI3
-    M2VmNzE2ODA4MTY4MWMxNDkyZTJlNjhiNmYwYTM4ZTllODk5NWEzYTNiNDQy
-    ZWRlZTA1YmM5NjA0YTEzZjQwOGYwYmEwNWY1NzZiMjZiYzEwMjY=
+    Y2M0NTYxMjU2MjZhMDVmODAyODMyMzM0N2ZiNGVmYzAyMzA4M2NhNDZjMzNh
+    ZGM4MWU3NzQxYzBiYmJmNzM3YzczNjEwM2E3OGVmNmUxNWQwN2NhZWQ4Zjdl
+    MjcyNmM0MjgwZTU1ZDNlZjQyNmMwN2E2OTIwMjBkOGUwOTY4Yzg=
   data.tar.gz: !binary |-
-    ODBkYzExMzZjZDM0ZTgyN2NmODg1MzI4ZWNkYWFiMzNhZTIwZmQ3N2NjM2U4
-    Y2ExYmY3MmQ1ZTE4NWU1YzNiN2JjMTg3MjA2ZTZkYmVhOGY1MzAwYjQ4NDQ5
-    MDcwN2QzNWQwMjk4MWQ1YThlNjYzMjcwZjEzZjcxNmM2ODNiNDg=
+    MzBjZjQxZTQ4YTA1YjdiODgwYTNiZjBkMzhmY2FiZjFkMTQ5Njg4NmU3ZDlj
+    MWJlMGExMjI0NmI0ZTIyNWJmOWUwZTVjOGQxY2NjOTIzYWM1Y2U1ZGMzZWYw
+    YzQzNThlMTg5MjkxYTNlYmI2NWZjYWUwMTg5Y2RmNjNiOGU5MmQ=

data/README.md

@@ -1,7 +1,7 @@
 # Homeseed
 
-CLI for config/dot-profile deployments
-also is a bash login session command flattener for remote ssh exec
+CLI for managing system configs and dot-profiles
+can be used for initializations, deployments and updates on remotes or localhost
 
 ## Installation
 
@@ -21,17 +21,26 @@ Or install it yourself as:
 
 homeseed commands
 ```
-➜ homeseed help
+$ homeseed
 Commands:
-  homeseed exec [-e <command> or -f <files>] [-u <user>] -s, --servers=SERVERS  # executes bash login session(s) on remote servers to run inline bash commands or bash commands from yml file
-  homeseed help [COMMAND]                                                       # Describe available commands or one specific command
-  homeseed plant [-u <user>] -s, --servers=SERVERS                              # installs homeshick and then dot profile based on localhost $HOME/.homeseed.yml
-  homeseed update [-u <user>] -s, --servers=SERVERS                             # updates dot profile based on localhost $HOME/.homeup.yml
+  homeseed exec [-e <command> or -f <files>] [-u <user>] [-p <has_password>] -s, --servers=SERVERS              # executes bash login session(s) on remote servers to run inline bash commands or bash ...
+  homeseed help [COMMAND]                                                                                       # Describe available commands or one specific command
+  homeseed plant [-u <user>] [-p <has_password>] [-c <clean>] [--url <url>] -s, --servers=SERVERS               # installs homeshick and then dot profile based on localhost $HOME/.homeseed.yml or url...
+  homeseed update [-u <user>] [-p <has_password>] [--url <url>] -s, --servers=SERVERS                           # updates dot profile based on localhost $HOME/.homeup.yml or url with yml commands
+  homeseed upload [-f <upload_files>] [-r <remote_path>] [-u <user>] [-p <has_password>] -s, --servers=SERVERS  # scp uploads file(s) to remote servers
 ```
 
-to install dot profile on csv server list run; uses $HOME/.homeseed.yml
+to distribute and install your dot profile(s) on multiple of servers run
 ```
-homeseed plant -s blackberry,blueberry,raspberry
+$ homeseed plant -s blackberry,blueberry,raspberry
+```
+this uses localhost's $HOME/.homeseed.yml by default; a url can given instead
+```
+$ homeseed plant -s pom --url 'i_am_a_homeseed.yml_file'
+```
+localhost can be specified as the target for system initialization
+```
+$ homeseed exec -s localhost --url 'setup_bluez_mupen_and_such.yml'
 ```
 
 ex $HOME/.homeseed.yml
@@ -45,9 +54,13 @@ homeshick:
     - vim-4-eva --force
 ```
 
-to update run; uses $HOME/.homeup.yml
+to update run; uses $HOME/.homeup.yml (same url based overrides apply here as well)
+```
+$ homeseed update -s soho
+```
+localhost can be specified here as well
 ```
-homeseed update -s soho
+$ homeseed update -s localhost
 ```
 
 ex $HOME/.homeup.yml

data/bin/homeseed

@@ -14,45 +14,42 @@ module Homeseed
     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
+      connection.exec
     end
 
-    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) or localhost; csv if multiple'
+    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: '-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 plant
-      config_files = %w(homeshick-prep.yml homeshick-install.yml homeshick-source.yml)
-      files = config_files.map { |file| File.expand_path("../../config/#{file}", __FILE__) }
-      files << File.expand_path('.homeseed.yml', ENV['HOME'])
-      connection = Homeseed::Connection.new options.merge(files: files.join(','))
-      connection.ssh_exec
+    def upload
+      connection = Homeseed::Connection.new options
+      connection.scp_upload
     end
 
-    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'
+    desc 'plant [-u <user>] [-p <has_password>] [-c <clean>] [--url <url>]',
+      'installs homeshick and then dot profile based on localhost $HOME/.homeseed.yml or url with yml commands'
+    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 update
-      config_files = %w(homeshick-source.yml)
-      files = config_files.map { |file| File.expand_path("../../config/#{file}", __FILE__) }
-      files << File.expand_path('.homeup.yml', ENV['HOME'])
-      connection = Homeseed::Connection.new options.merge(files: files.join(','))
-      connection.ssh_exec
+    method_option :clean, type: :boolean, default: true, desc: 'clean install toogle'
+    method_option :url, desc: "url to use vs file default: #{ENV['HOME']}/.homeseed.yml"
+    def plant
+      homeshick = Homeseed::Homeshick.new options
+      homeshick.install options
     end
 
-    desc 'upload [-f <upload_files>] [-r <remote_path>] [-u <user>] [-p <has_password>]',
-      'scp uploads file(s) to remote servers'
+    desc 'update [-u <user>] [-p <has_password>] [--url <url>]',
+      'updates dot profile based on localhost $HOME/.homeup.yml or url with yml commands'
     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: '-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
+    method_option :url, desc: "url to use vs file default: #{ENV['HOME']}/.homeup.yml"
+    def update
+      homeshick = Homeseed::Homeshick.new options
+      homeshick.update options
     end
   end
   HomeseedCliApp.start

data/homeseed.gemspec

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

data/lib/homeseed.rb

@@ -4,6 +4,8 @@ require 'net/ssh'
 require 'net/scp'
 require 'yaml'
 require 'highline/import'
-require_relative './logging'
-
-require_relative './homeseed/connection'
+require 'httparty'
+require 'logging'
+require 'homeseed/connection'
+require 'homeseed/homeshick'
+require 'homeseed/errors'

data/lib/homeseed/connection.rb

@@ -1,11 +1,14 @@
 module Homeseed
   class Connection
     include Logging
+    attr_reader :servers, :user, :has_password
 
     def initialize(params={})
-      raise 'servers and/or user not specified' unless params[:servers] and params[:user]
+      raise ConnectionError, 'servers and/or user not specified' unless params[:servers] and params[:user]
       @servers = params[:servers].split(',')
       @user = params[:user]
+      @commands = []
+      @logger = params[:logger] || logger
 
       if params[:has_password]
         cli = HighLine.new
@@ -14,31 +17,54 @@ module Homeseed
         @password = params[:password] || ''
       end
 
-      if params[:logger]
-        @logger = params[:logger]
-      else
-        logger.level = params[:logger_level] || Logger::INFO
-      end
+      push_commands(params)
+    end
 
+    def push_commands(params={})
       if params[:command]
-        @flat_commands = params[:command]
+        @commands.push(*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
+        push_bash_files(params[:files])
+      elsif params[:file]
+        push_bash_file(params[:file])
+      elsif params[:url]
+        push_url_commands(params[:url])
       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 config_file_path(file)
+      File.expand_path("../../../config/#{file}", __FILE__)
+    end
+
+    def push_bash_files(files)
+      @files = files
+      @files.each do |file|
+        push_bash_file(file)
+      end
+    end
+
+    def push_bash_file(file)
+      @file = file
+      yml_commands = YAML.load_file(file)
+      push_yml_commands(yml_commands)
+    end
+
+    def push_url_commands(url)
+      response =  HTTParty.get(url)
+      raise HTTPartyError unless response.code == 200
+      yml_commands = YAML.load(response.body)
+      push_yml_commands(yml_commands)
+    end
+
+    def push_yml_commands(yml_commands)
+      commands = []
+      self.process_hash(commands, '', yml_commands)
+      @commands.push(*commands)
+    end
+
     def process_hash(commands, current_key, obj)
       if obj.is_a?(Hash)
         obj.each do |new_key, value|
@@ -53,9 +79,29 @@ module Homeseed
       end
     end
 
+    def exec(params={})
+      if @servers.include?('localhost')
+        local_exec
+      else
+        ssh_exec
+      end
+    end
+
+    def local_exec
+      commands = @commands.join('; ') + ';'
+      @logger.info "localhost exec: #{commands}"
+
+      IO.popen("#{commands}") do |chunks|
+        chunks.each do |line|
+          log_exec(line)
+        end
+      end
+    end
+
     def ssh_exec
       Hash[@servers.map do |server|
-        logger.info "ssh #{@user}@#{server} exec: #{@flat_commands}"
+        commands = @commands.join('; ') + ';'
+        @logger.info "ssh #{@user}@#{server} exec: #{commands}"
 
         exit_status = nil
         exit_signal = nil
@@ -63,25 +109,14 @@ module Homeseed
         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.send_data "#{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
+                log_exec(data)
               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
+                log_exec(data)
               end
 
               ch.on_request("exit-status") do |c,data|
@@ -100,15 +135,29 @@ module Homeseed
       end]
     end
 
+    def log_exec(data)
+      data_lines = data.split(/[\r,\n]/)
+      data_lines.each do |data_line|
+        unless data_line == ''
+          if data_line.match(/error|failed|fatal/i)
+            @logger.error data_line
+          else
+            @logger.info data_line
+          end
+        end
+      end
+    end
+
     def scp_upload
+      raise ConnectionError, 'cannot scp to localhost' if @servers.include?('localhost')
       @servers.each do |server|
         @upload_files.each do |upload_file|
-          logger.info "starting scp #{upload_file} #{@user}@#{server}:#{@remote_path}"
+          @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}"
+            @logger.info "finished scp #{upload_file} #{@user}@#{server}:#{@remote_path}"
           rescue => err
-            logger.error "scp FAILED #{err}"
+            @logger.error "scp FAILED #{err}"
           end
         end
       end

data/lib/homeseed/errors.rb

@@ -0,0 +1,4 @@
+module Homeseed
+  class ConnectionError < StandardError; end
+  class HTTPartyError < StandardError; end
+end

data/lib/homeseed/homeshick.rb

@@ -0,0 +1,43 @@
+module Homeseed
+  class Homeshick < Connection
+    include Logging
+
+    def install(params={})
+      @config_files = Array[config_file_path('homeshick-install.yml')]
+      @config_files.push(config_file_path('homeshick-source.yml'))
+      @config_files.unshift(config_file_path('homeshick-prep.yml')) if params[:clean]
+      push_commands(files: @config_files)
+      if params[:url]
+        exec(params.merge(user_config: :url))
+      else
+        exec(params.merge(user_config: :local, file: '.homeseed.yml'))
+      end
+    end
+
+    def update(params={})
+      @config_files = Array[config_file_path('homeshick-source.yml')]
+      push_commands(files: @config_files)
+      fetch_user_config(params)
+      if params[:url]
+        exec(params.merge(user_config: :url))
+      else
+        exec(params.merge(user_config: :local, file: '.homeup.yml'))
+      end
+    end
+
+    def fetch_user_config(params={})
+      case params[:user_config]
+      when :url
+        push_commands(url: params[:url])
+      when :local
+        file = File.expand_path(params[:file], ENV['HOME'])
+        push_commands(file: file)
+      end
+    end
+
+    def exec(params={})
+      fetch_user_config(params)
+      super
+    end
+  end
+end

data/lib/homeseed/version.rb

@@ -1,3 +1,3 @@
 module Homeseed
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homeseed
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - rbuchss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.11'
 description: Flattens then SSH execs commands on remote server
 email:
 - rbuchss@gmail.com
@@ -115,6 +129,8 @@ files:
 - homeseed.gemspec
 - lib/homeseed.rb
 - lib/homeseed/connection.rb
+- lib/homeseed/errors.rb
+- lib/homeseed/homeshick.rb
 - lib/homeseed/version.rb
 - lib/logging.rb
 homepage: http://github.com/rbuchss/homeseed