ona 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/bin/ona

@@ -23,5 +23,6 @@ loop do
   cli.show line if line =~ /show/
   cli.setup line if line =~ /setup/
   cli.deploy line if line =~ /deploy/
-  cli.ssh line if line =~ /ssh/
+  cli.ssh_root line if line =~ /ssh-root/
+  cli.ssh_deploy line if line =~ /ssh-deploy/
 end

data/lib/ona_cli.rb

@@ -14,24 +14,31 @@ module Ona
       puts "
       Ona -- Deployment simplified.
 
-      help          # show this help
+      help              # show this help
 
-      ls            # short list for available servers
-      show 1        # detailed info for a specific server
-      show 1 2 3    # detailed info for servers 1 3 and 3
+      ls                # short list for available servers
+      show 1            # detailed info for a specific server
+      show 1 2 3        # detailed info for servers 1 3 and 3
 
-      deploy 1      # Deploy a specific server
-      deploy 1 2 3  # Deploy servers with ids: 1 2 and 3
+      deploy 1          # Deploy a specific server
+      deploy 1 2 3      # Deploy servers with ids: 1 2 and 3
 
-      setup 1       # Upload ssh-keys and bootstrap server
-      setup 1 2 3   # Setup servers with ids: 1 2 and 3
+      setup 1           # Upload ssh-keys and bootstrap server
+      setup 1 2 3       # Setup servers with ids: 1 2 and 3
 
-      ssh 1         # Open a ssh session to a remote server
-                    # (new window)
+      ssh-root 1        # Open a ssh session as root to a remote server
+                        # (new window)
 
-      ssh 1 2 3     # Open three ssh sessions to 1 2 and 3
+      ssh-root 1 2 3    # Open three ssh sessions to 1 2 and 3
+                        # (new window)
 
-      quit          # termintes the ona shell.
+      ssh-deploy 1      # Open a ssh session as deploy to a remote server
+                        # (new window)
+
+      ssh-deploy 1 2 3  # Open three ssh sessions to 1 2 and 3
+                        # (new window)
+
+      quit              # termintes the ona shell.
 
       "
     end
@@ -48,9 +55,15 @@ module Ona
       end
     end
 
-    def ssh string
+    def ssh_deploy string
+      selected_servers(string).each do |server|
+        system server.to_ssh 'deploy'
+      end
+    end
+
+    def ssh_root string
       selected_servers(string).each do |server|
-        system server.to_ssh
+        system server.to_ssh 'root'
       end
     end
 

data/lib/ona_server.rb

@@ -29,11 +29,11 @@ module Ona
       "rake cook server=root@#{ip} dna=#{dna} instance_role=#{role}"
     end
 
-    def to_ssh
+    def to_ssh user
 "osascript 2>/dev/null <<EOF
     tell application \"Terminal\"
         activate
-        do script with command \"ssh root@#{ip}\"
+        do script with command \"ssh #{user}@#{ip}\"
     end tell
 EOF"
     end

data/ona.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ona}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kazuyoshi tlacaelel"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ona
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - kazuyoshi tlacaelel