ona 0.1.10 → 0.1.11

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/bin/ona

@@ -14,7 +14,7 @@ cli = Ona::Cli.new(stack)
 
 loop do
   line = Readline.readline('Ona> ', true)
-  if line == 'quit'
+  if (line == 'quit') || (line == 'exit')
     puts 'bye.'
     break
   end
@@ -23,7 +23,8 @@ loop do
   cli.show line if line =~ /show/
   cli.setup line if line =~ /setup/
   cli.deploy line if line =~ /deploy/
-  cli.ssh_root line if line =~ /ssh-root/
-  cli.ssh_deploy line if line =~ /ssh-app/
+  cli.ssh_root line if line =~ /ssh#/
+  cli.ssh_deploy line if line =~ /ssh/
   cli.http line if line =~ /http/
+  cli.key line if line =~ /key/
 end

data/lib/ona_cli.rb

@@ -14,24 +14,16 @@ module Ona
       puts "
       Ona -- Deployment simplified.
 
-      help              # show this help
-
-      ls                # short list for available servers
-
-      show 1            # detailed info for a specific server
       deploy 1          # Deploy a specific server
-
-      setup 1           # Upload ssh-keys and bootstrap server
-
-      ssh-root 1        # Open a ssh session as root to a remote server
-                        # (new window)
-
-      ssh-app 1         # Open a ssh session as deploy to a remote server
-                        # (new window)
-
+      help              # show this help
       http 1            # Open the servers in default browser.
-
+      key 1             # Uploads my public ssh-key to remote server (root)
+      ls                # short list for available servers
       quit              # termintes the ona shell.
+      setup 1           # Upload ssh-keys and bootstrap server
+      show 1            # detailed info for a specific server
+      ssh 1             # Open a ssh session as deploy to a remote server
+      ssh# 1            # Open a ssh session as root to a remote server
 
       --
 
@@ -48,6 +40,13 @@ module Ona
       end
     end
 
+    def key string
+      selected_servers(string).each do |server|
+        system server.setup_ssh
+      end
+    end
+
+
     def show string
       selected_servers(string).each do |server|
         puts server.to_s
@@ -74,6 +73,11 @@ module Ona
 
     def deploy string
       selected_servers(string).each do |server|
+        puts server.to_s
+        system server.say_sure_to_deploy
+        puts 'Type [yes] to continue. or anything else to skip.'
+        print 'What to do? :'
+        next unless gets == 'yes'
         system server.deploy
         system server.say_deployed
       end

data/lib/ona_server.rb

@@ -21,6 +21,10 @@ module Ona
       "say #{desc} setup terminated"
     end
 
+    def say_sure_to_deploy
+      "say 'Are you sure to deploy #{desc}'"
+    end
+
     def bootstrap
       "rake bootstrap server=root@#{ip}"
     end

data/ona.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ona}
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kazuyoshi tlacaelel"]
-  s.date = %q{2010-07-28}
+  s.date = %q{2010-07-29}
   s.default_executable = %q{ona}
   s.description = %q{Simple shell for deployment.}
   s.email = %q{kazu.dev@gmail.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ona
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - kazuyoshi tlacaelel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 -05:00
+date: 2010-07-29 00:00:00 -05:00
 default_executable: ona
 dependencies: 
 - !ruby/object:Gem::Dependency