homeseed 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzkyMjgwYTZhYmMzMGE4ZmY0YjM2NzEwZDVmODAxNTYxODhhYTBlOA==
+    MzE1ZmFjNzkxZjBhMGUwNjRkMmIyY2Y4ZTc2YzU3NzliZDcwYTg2Yg==
   data.tar.gz: !binary |-
-    YzhmNzdmNThmMmRiNDMwNzNkMWQyYmEwODFmYzE0YTU4MjczM2Q5YQ==
+    MTUzNDcxYTVmNWJlOWUwNjdiODExYzUwZTE5ZTRiZTk0NGEwMTQ0Zg==
 SHA512:
   metadata.gz: !binary |-
-    MTUxYWFiNmQxMTM2ZjQwNmJmNzAwMzQ4ZDA1MDU5NjY0ZDEyODlmODdkYTM1
-    ZjExZDZiNGMzMWU0OWMyZGRjZmU1NjRjZGU1M2FlOTc3OGNmNmMwMjEzZDkx
-    ZWUzZWVmNWE4M2E2NjExMjFjMWZjYzViNzg1NDc2ZTFkNjM2YTY=
+    MWIwZDIwYmZiMWQ5NTZjNzUxMzY0YTc2ZWNiYTIwMDdiMWY0NGM2ZGExMzEz
+    NDU4OTVhYWRlNDEwMmMxMzUxN2U5ZjI2MTlmNjRhMzRmYzQ2ZmQ4M2EyNjAw
+    NzI4NzhjOWM2ZTJlNDJlZTA0NDJlZjc2Zjk2MGU5YzhiYTk1Yjc=
   data.tar.gz: !binary |-
-    NTAxZjE3M2FmMDRmNzI0N2UwMWQ5ZDJmNjY0YzQzMmFjZjFhZjQ1NzhhNmU1
-    MDQwYWQzZGE3YjI0M2FjYzc0MGY1NWYwMzA0NzZjNzVkMmMxNDBmYjljNjBh
-    Y2YwMDk2YmNiODA5MGE2NmUzZWRkMjE5ODRjZGE1ZGIwZTkxNjM=
+    ODBkMDBkZGYyNzMzMDNlYzkyMWZkYTQ1NjkzZGFmNGNiYjI4ZmVhMmI2MmNj
+    NTI2MzhjNzQwZjkyZGQ1M2IyYWVkODhkNjlmODA1ZTNhNjE4MDQ0ODk3Mzk3
+    MWNlZGYyNzYyODgxODE0NzlkMjAzYmQ0NTYyNGU0YTMxY2E3ZWY=

data/README.md

@@ -1,6 +1,7 @@
 # Homeseed
 
-Bash command flattener for remote ssh exec
+CLI for config/dot-profile deployments
+also is a bash login session command flattener for remote ssh exec
 
 ## Installation
 
@@ -18,16 +19,45 @@ Or install it yourself as:
 
 ## Usage
 
-Examples
+homeseed commands
+```
+➜ homeseed help
+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
+```
+
+to install dot profile on csv server list run; uses $HOME/.homeseed.yml
+```
+homeseed plant -s blackberry,blueberry,raspberry
+```
+
+ex $HOME/.homeseed.yml
+```
+homeshick:
+  clone:
+    - https://github.com/rbuchss/terminator.git --batch
+    - https://github.com/rbuchss/vim-4-eva.git --batch
+  link:
+    - terminator --force
+    - vim-4-eva --force
+```
 
-to install dot profile on server list run
+to update run; uses $HOME/.homeup.yml
 ```
-homeseed plant -s blackberry,blueberry,raspberry -f config/shick-seed.yml
+homeseed update -s soho
 ```
 
-to update run
+ex $HOME/.homeup.yml
 ```
-homeseed plant -s soho -f config/shick-update.yml
+homeshick:
+  pull:
+    - --force --batch
+  link:
+    - terminator --force
+    - vim-4-eva --force
 ```
 
 ## Contributing

data/bin/homeseed

@@ -5,18 +5,39 @@ require 'thor'
 
 module Homeseed
   class HomeseedCliApp < Thor
-    desc 'exec [-s <servers>] [-e <command> or -f <files>] [-u <user>]', ''
-    option :servers, required: true, aliases: '-s', desc: 'ssh hostname(s)'
-    option :command, aliases: '-e', desc: 'bash command to exec'
-    option :files, aliases: '-f', desc: 'yml command file(s) to exec'
-    option :user, aliases: '-u', desc: 'ssh username', default: ENV['USER']
-    method_option :has_password, aliases: '-p', type: :boolean, default: false, desc: 'has password; no ssh keys'
+    desc 'exec [-e <command> or -f <files>] [-u <user>]',
+      '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']
     def exec
       connection = Homeseed::Connection.new options
       connection.ssh_exec
     end
 
+    desc 'plant [-u <user>]',
+      '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 :user, aliases: '-u', desc: 'ssh username', default: ENV['USER']
     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
+    end
+
+    desc 'update [-u <user>]',
+      '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']
+    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
     end
   end
   HomeseedCliApp.start

data/config/homeshick-install.yml

@@ -0,0 +1,3 @@
+git:
+  clone:
+    - git://github.com/andsens/homeshick.git $HOME/.homesick/repos/homeshick

data/config/homeshick-prep.yml

@@ -0,0 +1,3 @@
+rm:
+  - -rf $HOME/.homesick/repos
+  - -rf $HOME/git

data/config/homeshick-source.yml

@@ -0,0 +1,2 @@
+source:
+  - "$HOME/.homesick/repos/homeshick/homeshick.sh"

data/lib/homeseed/version.rb

@@ -1,3 +1,3 @@
 module Homeseed
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/homeseed.rb

@@ -1,7 +1,6 @@
 require "homeseed/version"
 require 'logger'
 require 'net/ssh'
-require 'highline/import'
 require 'yaml'
 
 module Homeseed
@@ -15,10 +14,10 @@ module Homeseed
     end
 
     def initialize(params={})
-      raise unless params[:servers] and (params[:files] or params[:command]) and params[:user]
+      raise unless params[:servers] and (params[:command] or params[:files]) and params[:user]
       @servers = params[:servers].split(',')
       @user = params[:user]
-      @has_password = params[:password]
+      @password = params[:password] || ''
 
       if params[:command]
         @flat_commands = params[:command]
@@ -52,27 +51,26 @@ module Homeseed
       Hash[@servers.map do |server|
         logger.info "ssh #{@user}@#{server} exec: #{@flat_commands}"
 
-        password = @has_password ? ask("Enter password: ") { |q| q.echo = "*" } : ''
         exit_status = 0
-        Net::SSH.start(server, @user, password: password) do |ssh|
+        Net::SSH.start(server, @user, password: @password) do |ssh|
           ssh.open_channel do |channel|
-            channel.exec("bash -l") do |ch, success|
+            channel.exec("bash -l") do |ch,success|
               ch.send_data "#{@flat_commands}\n"
-              ch.on_data do |c, data|
+              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|
+              ch.on_extended_data do |c,type,data|
                 data_lines = data.split(/[\r,\n]/)
                 data_lines.each do |data_line|
                   logger.error data_line unless data_line == ''
                 end
               end
 
-              ch.on_request("exit-status") do |ch,data|
+              ch.on_request("exit-status") do |c,data|
                 exit_status = data.read_long
               end
               ch.send_data "exit\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homeseed
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - rbuchss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,9 +94,10 @@ files:
 - README.md
 - Rakefile
 - bin/homeseed
-- config/setup-linux.yml
-- config/shick-seed.yml
-- config/shick-update.yml
+- config/homeshick-install.yml
+- config/homeshick-prep.yml
+- config/homeshick-source.yml
+- config/rbuchss-setup-linux.yml
 - homeseed.gemspec
 - lib/homeseed.rb
 - lib/homeseed/version.rb

data/config/shick-seed.yml

@@ -1,14 +0,0 @@
-source:
-  - "$HOME/.homesick/repos/homeshick/homeshick.sh"
-homeshick:
-  clone:
-    - https://github.com/git/git.git --batch
-    - https://github.com/rbuchss/terminator.git --batch
-    - https://github.com/rbuchss/vim-4-eva.git --batch
-  link:
-    - terminator --force
-    - vim-4-eva --force
-rm:
-  - -rf $HOME/git
-ln:
-  - -s -f $HOME/.homesick/repos/git $HOME/git

data/config/shick-update.yml

@@ -1,8 +0,0 @@
-source:
-  - "$HOME/.homesick/repos/homeshick/homeshick.sh"
-homeshick:
-  pull:
-    - --force --batch
-  link:
-    - terminator --force
-    - vim-4-eva --force