homeseed 0.0.14 → 0.0.15

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTJiMDg0ZDU5ZTkzM2IwN2EyNTI3ODI0ZTFkNThhMzMwNGNhYjgxMg==
-  data.tar.gz: !binary |-
-    ODYxNWY2MDFhZDhiMTQ4MzVhYTA4ZGFjZDM2MTQ0NTMxNmY0MWQ3NA==
+SHA1:
+  metadata.gz: 54692603f8072693a7673c98dfc51208b33b518c
+  data.tar.gz: 941d1ff27b2598a8f198fc3dd1b9d7b1d32424e2
 SHA512:
-  metadata.gz: !binary |-
-    Y2M0NTYxMjU2MjZhMDVmODAyODMyMzM0N2ZiNGVmYzAyMzA4M2NhNDZjMzNh
-    ZGM4MWU3NzQxYzBiYmJmNzM3YzczNjEwM2E3OGVmNmUxNWQwN2NhZWQ4Zjdl
-    MjcyNmM0MjgwZTU1ZDNlZjQyNmMwN2E2OTIwMjBkOGUwOTY4Yzg=
-  data.tar.gz: !binary |-
-    MzBjZjQxZTQ4YTA1YjdiODgwYTNiZjBkMzhmY2FiZjFkMTQ5Njg4NmU3ZDlj
-    MWJlMGExMjI0NmI0ZTIyNWJmOWUwZTVjOGQxY2NjOTIzYWM1Y2U1ZGMzZWYw
-    YzQzNThlMTg5MjkxYTNlYmI2NWZjYWUwMTg5Y2RmNjNiOGU5MmQ=
+  metadata.gz: a1ecb3b0e55500e7c87466a0859a69f6102aa4748798ba0c83813a8dedd24115354d81b4b62e2d88ed2851ee9fc99ced39939c73e5c2feb86ddf5bb802d9904f
+  data.tar.gz: 858fa3fb7c7d5b263b13aeb94867c20f948d187e3a2f8928f0eb8e3d8ed320aac09cb0e97bf4f8faaf59326bfd000c94d52f2f82c77fc6545a2855beb75dba16

data/config/homeshick-prep.yml

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

data/lib/homeseed/connection.rb

@@ -91,8 +91,12 @@ module Homeseed
       commands = @commands.join('; ') + ';'
       @logger.info "localhost exec: #{commands}"
 
-      IO.popen("#{commands}") do |chunks|
-        chunks.each do |line|
+      Open3.popen2e('/bin/bash') do |stdin, stdout_err, wait_thr|
+        @commands.each do |command|
+          stdin.puts(command)
+        end
+        stdin.close
+        while line = stdout_err.gets
           log_exec(line)
         end
       end

data/lib/homeseed/homeshick.rb

@@ -2,9 +2,15 @@ module Homeseed
   class Homeshick < Connection
     include Logging
 
+    EXEC_PATH = '$HOME/.homesick/repos/homeshick/bin/homeshick '
+
+    def initialize(params={})
+      super
+      @commands = []
+    end
+
     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]
@@ -15,8 +21,6 @@ module Homeseed
     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))
@@ -33,6 +37,7 @@ module Homeseed
         file = File.expand_path(params[:file], ENV['HOME'])
         push_commands(file: file)
       end
+      @commands.map! { |command| command.gsub(/^homeshick /, EXEC_PATH) }
     end
 
     def exec(params={})

data/lib/homeseed/version.rb

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

data/lib/homeseed.rb

@@ -1,5 +1,6 @@
 require 'homeseed/version'
 require 'logger'
+require 'open3'
 require 'net/ssh'
 require 'net/scp'
 require 'yaml'

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: homeseed
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - rbuchss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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'
 - !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
@@ -116,7 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -124,8 +124,6 @@ files:
 - bin/homeseed
 - config/homeshick-install.yml
 - config/homeshick-prep.yml
-- config/homeshick-source.yml
-- config/rbuchss-setup-linux.yml
 - homeseed.gemspec
 - lib/homeseed.rb
 - lib/homeseed/connection.rb
@@ -143,19 +141,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Flattened SSH exec
 test_files: []
-has_rdoc: 

data/config/homeshick-source.yml

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

data/config/rbuchss-setup-linux.yml

@@ -1,9 +0,0 @@
-sudo:
-  apt-get:
-    update:
-      - -y
-    install:
-      - ack-grep -y
-      - lynx -y
-      - tree -y
-      - vim -y