homeseed 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54692603f8072693a7673c98dfc51208b33b518c
-  data.tar.gz: 941d1ff27b2598a8f198fc3dd1b9d7b1d32424e2
+  metadata.gz: e4e2162e7ab5ff24a5c7ec699b97b85146e13157
+  data.tar.gz: 974de6e59cd38fdb4be2c386d0a3503369486ea8
 SHA512:
-  metadata.gz: a1ecb3b0e55500e7c87466a0859a69f6102aa4748798ba0c83813a8dedd24115354d81b4b62e2d88ed2851ee9fc99ced39939c73e5c2feb86ddf5bb802d9904f
-  data.tar.gz: 858fa3fb7c7d5b263b13aeb94867c20f948d187e3a2f8928f0eb8e3d8ed320aac09cb0e97bf4f8faaf59326bfd000c94d52f2f82c77fc6545a2855beb75dba16
+  metadata.gz: 8ad123e26a1ca61a73e857b77596381aadd50e8db8618a40cf37daa731391396680203b555f27571e53bcf824cdb31862d256dcd68334ecee9726a11ad5199d9
+  data.tar.gz: 5659bc5ab5dfb8d30faf645941ce19791378d8fac877c00cfb1d3a7a8e65e0b1ee526ee36539d8be3f86efe7bebca951954c3afcb2289953523d71558fa2b144

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 ## Usage
 
 homeseed commands
-```
+```bash
 $ homeseed
 Commands:
   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 ...
@@ -31,46 +31,34 @@ Commands:
 ```
 
 to distribute and install your dot profile(s) on multiple of servers run
-```
+```bash
 $ homeseed plant -s blackberry,blueberry,raspberry
 ```
-this uses localhost's $HOME/.homeseed.yml by default; a url can given instead
-```
+this uses your user's local $HOME/.homeseed.yml by default; a url can be given instead to override this
+```bash
 $ homeseed plant -s pom --url 'i_am_a_homeseed.yml_file'
 ```
 localhost can be specified as the target for system initialization
-```
+```bash
 $ homeseed exec -s localhost --url 'setup_bluez_mupen_and_such.yml'
 ```
 
-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 update run; uses $HOME/.homeup.yml (same url based overrides apply here as well)
-```
+to update run; uses $HOME/.homeseed.yml by default (same url based overrides apply here as well)
+```bash
 $ homeseed update -s soho
 ```
 localhost can be specified here as well
-```
+```bash
 $ homeseed update -s localhost
 ```
 
-ex $HOME/.homeup.yml
-```
-homeshick:
-  pull:
-    - --force --batch
-  link:
-    - terminator --force
-    - vim-4-eva --force
+ex user config ($HOME/.homeseed.yml)
+```ruby
+:repos:
+  terminator:
+    :origin: https://github.com/rbuchss/terminator.git
+  vim-4-eva:
+    :origin: https://github.com/rbuchss/vim-4-eva.git
 ```
 
 ## Contributing

data/bin/homeseed

@@ -34,7 +34,7 @@ module Homeseed
     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'
-    method_option :clean, type: :boolean, default: true, desc: 'clean install toogle'
+    method_option :clean, alias: '-c', type: :boolean, default: false, 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

data/lib/homeseed/connection.rb

@@ -71,11 +71,13 @@ module Homeseed
           combined_key = [current_key, new_key].delete_if { |k| k == '' }.join(" ")
           process_hash(commands, combined_key, value)
         end
-      else obj.is_a?(Array)
+      elsif obj.is_a?(Array)
         obj.each do |value|
           combined_key = [current_key, value].delete_if { |k| k == '' }.join(" ")
           commands << combined_key
         end
+      else
+        commands
       end
     end
 

data/lib/homeseed/homeshick.rb

@@ -2,7 +2,7 @@ module Homeseed
   class Homeshick < Connection
     include Logging
 
-    EXEC_PATH = '$HOME/.homesick/repos/homeshick/bin/homeshick '
+    EXEC_PATH = '$HOME/.homesick/repos/homeshick/bin/homeshick'
 
     def initialize(params={})
       super
@@ -13,36 +13,32 @@ module Homeseed
       @config_files = Array[config_file_path('homeshick-install.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'))
+      fetch_user_config(params)
+      user_commands = @user_config[:repos].map do |repo_name,repo_meta|
+        "#{EXEC_PATH} clone #{repo_meta[:origin]} --batch && #{EXEC_PATH} symlink #{repo_name} --force"
       end
+      push_commands(command: user_commands)
+      exec
     end
 
     def update(params={})
       fetch_user_config(params)
-      if params[:url]
-        exec(params.merge(user_config: :url))
-      else
-        exec(params.merge(user_config: :local, file: '.homeup.yml'))
+      user_commands = @user_config[:repos].map do |repo_name,repo_meta|
+        "#{EXEC_PATH} pull #{repo_name} --batch && #{EXEC_PATH} symlink #{repo_name} --force"
       end
+      push_commands(command: user_commands)
+      exec
     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)
+      if params[:url]
+        response =  HTTParty.get(params[:url])
+        raise HTTPartyError unless response.code == 200
+        @user_config = YAML.load(response.body)
+      else
+        file = File.expand_path('.homeseed.yml', ENV['HOME'])
+        @user_config = YAML.load_file(file)
       end
-      @commands.map! { |command| command.gsub(/^homeshick /, EXEC_PATH) }
-    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.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homeseed
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - rbuchss