ona 0.1.20 → 0.1.21

data/Gemfile

@@ -0,0 +1,4 @@
+
+gem 'jeweler'
+gem 'thoughtbot-shoulda', '2.10.2'
+

data/VERSION

@@ -1 +1 @@
-0.1.20
+0.1.21

data/lib/ona_cli.rb

@@ -75,9 +75,7 @@ module Ona
 
     def deploy string
       selected_servers(string).each do |server|
-        puts server.to_s
-        puts 'Type [yes] to continue. or anything else to skip.'
-        print 'What to do? :'
+        prompt_for_continuation
         system server.say_sure_to_deploy
         line = gets
         next unless line.chomp == 'yes'
@@ -87,9 +85,15 @@ module Ona
     end
 
     def setup string
-      install_ssh_keys string
-      bootstrap string
-      system server.say_finished_setup
+      key string
+      selected_servers(string).each do |server|
+        prompt_for_continuation
+        system server.say_sure_to_setup
+        line = gets
+        next unless line.chomp == 'yes'
+        system server.bootstrap
+        system server.say_finished_setup
+      end
     end
 
     def keys
@@ -100,16 +104,10 @@ module Ona
 
     protected
 
-    def bootstrap string
-      selected_servers(string).each do |server|
-        system server.bootstrap
-      end
-    end
-
-    def install_ssh_keys string
-      selected_servers(string).each do |server|
-        system server.setup_ssh
-      end
+    def prompt_for_continuation server
+      puts server.to_s
+      puts 'Type [yes] to continue. or anything else to skip.'
+      print 'What to do? >'
     end
 
   end

data/lib/ona_server.rb

@@ -12,8 +12,6 @@ module Ona
     def setup_ssh
       puts 'Setting up key for root'
       "rake upload_ssh_key server=root@#{ip} pass=#{pass} key=#{local_key}"
-      puts 'Setting up key for deploy'
-      "rake upload_ssh_key server=deploy@#{ip} pass=#{pass} key=#{local_key}"
     end
 
     def say_deployed
@@ -24,6 +22,10 @@ module Ona
       "say #{desc} setup terminated"
     end
 
+    def say_sure_to_setup
+      "say 'Are you sure to setup #{desc}'"
+    end
+
     def say_sure_to_deploy
       "say 'Are you sure to deploy #{desc}'"
     end

data/ona.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ona}
-  s.version = "0.1.20"
+  s.version = "0.1.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kazuyoshi tlacaelel"]
-  s.date = %q{2010-07-30}
+  s.date = %q{2010-08-19}
   s.default_executable = %q{ona}
   s.description = %q{Simple shell for deployment.}
   s.email = %q{kazu.dev@gmail.com}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "Gemfile",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ona
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 1
-  - 20
-  version: 0.1.20
+  - 21
+  version: 0.1.21
 platform: ruby
 authors: 
 - kazuyoshi tlacaelel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -05:00
+date: 2010-08-19 00:00:00 -05:00
 default_executable: ona
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile