dolphin 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd0208f9074f8be9502f8e03836774c861c49943
-  data.tar.gz: 1aad911df6b5328bab43b6857affc253fbd30298
+  metadata.gz: 96307e5f4700eaa30d22be8103a85ddcf32c8132
+  data.tar.gz: fc210b44ca75f5683e537f271063a15a373bca0a
 SHA512:
-  metadata.gz: 9559dddc9db2798166616886a03539314f95b129937e62ad3b625bac89abc24c1884adfdab208dc5cffb3fd5319363e9d0a42967efe89f2e3dc48ea84edefdc2
-  data.tar.gz: 468e2df8516c91badb5ceccb9fe504d49087ab7906905381c13f9529c265f8d5594af0f170903022c00950f284d4fb006593443741633f69ed894726afdf8d81
+  metadata.gz: 546c32db70818adbf42cc99a2959d6613a5bfd354ce052040e12e8818a1a885fd521bdff61491718aa8752184c4d03a2cd5bdf41012369e01cb5f21d5e7ad8c5
+  data.tar.gz: 7ae901e6f2bda4e7c9e546c7902fbd3aabdcdce0efaba45f60e2b7d67e862a873f631e5df601b57c60991c6cff4dd418f31e29a6cc97a79eca247287cc83a7e3

data/lib/dolphin.rb

@@ -33,25 +33,21 @@ module Dolphin
 
     end
 
-    def parse_commands(menu, join=false)
+    def parse_commands(menu)
       # Helper method to parse a list of text menu of possible commands,
       # which may contain empty lines or commented out with #
-      # commands from one menu item will be joined into one command
+      # commands can be separated into groups
 
       commands = []
-      menu.each do |item|
+      menu.each do |group|
         buffer = []
-        item.split(/\r?\n/).each do |line|
+        group.split(/\r?\n/).each do |line|
           line = line.strip
           unless line.empty? or line.start_with?('#') # empty or commented out
             buffer << line
           end
         end
-        if join
-          commands << buffer.join('; ')
-        else
-          commands.push(*buffer)
-        end
+        commands.push(*buffer)
       end
       commands
     end
@@ -64,54 +60,7 @@ module Dolphin
       end
     end
 
-    def ssh_exec(command, &block)
-      status = nil
-      output = ''
-
-      channel = ssh_connection.open_channel do |chan|
-        chan.exec(command) do |ch, success|
-          puts "#{'!'*10} command failed: #{command}" unless success
-          # ch.request_pty
-
-          ch.on_data do |c, data|
-            output << data
-            yield(c, :stdout, data)
-          end
-
-          ch.on_extended_data do |c, type, data|
-            output << data
-            yield(c, :stderr, data)
-          end
-
-          ch.on_request "exit-status" do |c, data|
-            status = data.read_long
-          end
-        end
-      end
-
-      channel.wait
-      [status, output]
-    end
-
     def execute(menu)
-      # execute commands defined in menu
-      commands = parse_commands(menu, true)
-
-      puts "Executing on [#{@host}]"
-      commands.each do |command|
-        puts "\n#{'='*60}\n#{command}\n...... =>\n\n"
-
-        status, output = ssh_exec command do |ch, stream, data|
-          case stream
-          when :stdout then $stdout.print data
-          when :stderr then $stderr.print data
-          end
-          ch.send_data(askpass) if data =~ /^sudo password: /
-        end
-      end
-    end
-
-    def run(menu)
       # execute commands defined in menu
       commands = parse_commands(menu)
       puts "#{'*'*10}Executing commands#{'*'*10}\n"
@@ -120,14 +69,14 @@ module Dolphin
       end
       puts "#{'='*60}\n"
 
-      # use Parallel to run commands on multiple servers in parallel
+      # use Parallel to execute commands on multiple servers in parallel
       tracks = @servers.size
       # 3 threads maximum
       tracks = 3 if tracks > 3
       # record output to display at the end
       output = {}
 
-      Parallel.map(@servers, in_threads: 3) do |server|
+      Parallel.map(@servers, in_threads: tracks) do |server|
         session = ssh_connection(server)
         output[server] = [] # output from this server
 
@@ -198,10 +147,12 @@ module Dolphin
     def chruby
       menu = [
         "
-          # install chruby
-          wget -O chruby-0.3.5.tar.gz https://github.com/postmodern/chruby/archive/v0.3.5.tar.gz
-          tar -xzvf chruby-0.3.5.tar.gz
-          cd chruby-0.3.5/
+          # git clone
+          if [ ! -d 'chruby' ]; then git clone https://github.com/postmodern/chruby.git ; fi
+          # checkout tag
+          cd chruby
+          git checkout v0.3.5
+          # install
           sudo make install
         ",
       ]
@@ -267,7 +218,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
     desc "rvm", "remove rvm"
@@ -279,7 +230,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
     desc "apache", "remove apache"
@@ -292,7 +243,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
     desc "git", "install latest git"
@@ -318,7 +269,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
   end
@@ -342,7 +293,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
     desc "conf", "config nginx"
@@ -353,7 +304,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
     desc "start", "start nginx"
@@ -365,7 +316,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
     desc "stop", "stop nginx"
@@ -377,7 +328,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
     desc "restart", "restart nginx"
@@ -389,7 +340,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
   end
@@ -407,7 +358,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
     desc "go", "normal deploy procedure"
@@ -432,7 +383,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
   end
@@ -455,7 +406,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
   end
@@ -473,7 +424,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
     desc "stop", "stop puma"
@@ -485,7 +436,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
     desc "restart", "restart puma"
@@ -498,7 +449,7 @@ module Dolphin
         ",
       ]
 
-      run menu
+      execute menu
     end
 
   end

data/lib/dolphin/version.rb

@@ -1,3 +1,3 @@
 module Dolphin
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolphin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - |
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor