railshoster 0.6.9 → 0.6.10

data/CHANGELOG.textile

@@ -94,3 +94,7 @@ h3. 0.6.9
 
 * Support GLI 1.x.x and 2.x.x
 
+h3. 0.6.10
+
+* Ask for ssh password if the init-hash doesn't work
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    railshoster (0.6.9)
+    railshoster (0.6.10)
       bundler (>= 1.0.15)
       capistrano
       capistrano-ext

data/lib/railshoster/init_command.rb

@@ -70,19 +70,22 @@ module Railshoster
       git_url = get_git_remote_url_from_git_config          
       @app_hash["git"] = git_url
 
-      #TODO Add connection test -> If there's already access -> no need to do this
-      selected_key = Railshoster::Utilities.select_public_ssh_key  
-      @app_hash["public_ssh_key"] = Pathname.new(selected_key[:path]).basename.to_s.gsub(".pub", "")
-          
-      create_remote_authorized_key_file_from_app_hash(@app_hash, selected_key)      
+      sftp_session = try_to_get_a_sftp_session_without_password(@app_hash["h"].first, @app_hash["u"])
       
+      if sftp_session == nil
+        selected_key = Railshoster::Utilities.select_public_ssh_key  
+        @app_hash["public_ssh_key"] = Pathname.new(selected_key[:path]).basename.to_s.gsub(".pub", "")
+        create_remote_authorized_key_file_from_app_hash(@app_hash, selected_key) 
+      end     
+    
       @app_hash["remote_db_yml"]  = "#{@app_hash["deploy_to"]}/shared/config/database.yml"
 
       @app_hash["h"].each do |host|
-        update_database_yml_db_adapters_via_ssh(host)
+        update_database_yml_db_adapters_via_ssh(host, sftp_session)
       end
       
-      deployrb_str = create_deployrb(@app_hash)      
+
+      deployrb_str = create_deployrb(@app_hash)     
       write_deploy_rb(deployrb_str)
       capify_project
       success_message

data/lib/railshoster/init_database_helpers.rb

@@ -10,16 +10,19 @@ module Railshoster
     protected
     
     # Receive and update a database.yml via SFTP.
-    def update_database_yml_db_adapters_via_ssh(host, ssh_username = @app_hash["u"], path_to_dbyml = @app_hash["remote_db_yml"])
+    def update_database_yml_db_adapters_via_ssh(host, sftp_session=nil, ssh_username = @app_hash["u"], path_to_dbyml = @app_hash["remote_db_yml"])
       dbyml = ""
-      Net::SFTP.start(host, ssh_username) do |sftp|                
-        sftp.file.open(path_to_dbyml) do |file|
-          dbyml = file.read
-        end
-        sftp.file.open(path_to_dbyml, "w+") do |file|
-          file.write(update_database_yml_db_adapters_in_yml(dbyml))
-        end
+      
+      sftp_session ||= Net::SFTP.start(host, ssh_username)
+                     
+      sftp_session.file.open(path_to_dbyml) do |file|
+        dbyml = file.read
+      end
+      
+      sftp_session.file.open(path_to_dbyml, "w+") do |file|
+        file.write(update_database_yml_db_adapters_in_yml(dbyml))
       end
+      
     end
     
     def get_path_to_dbyml

data/lib/railshoster/init_ssh_helpers.rb

@@ -1,4 +1,5 @@
 require 'net/sftp'
+require 'highline/import'
 
 module Railshoster
   module InitSshHelpers
@@ -40,21 +41,41 @@ module Railshoster
     def create_remote_authorized_key_file(host, ssh_username, password, key, remote_dot_ssh_path = ".ssh", target_username = nil)
 
       remote_authorized_keys_path = remote_dot_ssh_path + "/authorized_keys"
-      Net::SFTP.start(host, ssh_username, :password => password) do |sftp|                
-
-        #TODO Smarter way to determine home directory
-        stats = sftp.stat!("/home/#{target_username}") if target_username
-
-        begin
-          sftp.mkdir!(remote_dot_ssh_path)
-          sftp.setstat(remote_dot_ssh_path, :uid => stats.uid, :gid => stats.gid) if target_username
-        rescue Net::SFTP::StatusException => e
-          # Most likely the .ssh folder already exists raise again if not.
-          raise e unless e.code == 4
-        end
-        sftp.upload!(key[:path].to_s, remote_authorized_keys_path)
-        sftp.setstat(remote_authorized_keys_path, :uid => stats.uid, :gid => stats.gid) if target_username 
-      end      
+      
+      begin 
+  
+        Net::SFTP.start(host, ssh_username, :password => password) do |sftp|                
+          #TODO Smarter way to determine home directory
+          stats = sftp.stat!("/home/#{target_username}") if target_username
+  
+          begin
+            sftp.mkdir!(remote_dot_ssh_path)
+            sftp.setstat(remote_dot_ssh_path, :uid => stats.uid, :gid => stats.gid) if target_username
+          rescue Net::SFTP::StatusException => e
+            # Most likely the .ssh folder already exists raise again if not.
+            raise e unless e.code == 4
+          end
+          sftp.upload!(key[:path].to_s, remote_authorized_keys_path)
+          sftp.setstat(remote_authorized_keys_path, :uid => stats.uid, :gid => stats.gid) if target_username 
+        end 
+      rescue Net::SSH::AuthenticationFailed => e
+        create_remote_authorized_key_file(host, ssh_username, ask_for_ssh_password(ssh_username), key, remote_dot_ssh_path, target_username)
+      end
+        
+    end
+    
+    def try_to_get_a_sftp_session_without_password(host, user)
+    
+      begin 
+        return Net::SFTP.start(host, user)
+      rescue Net::SSH::AuthenticationFailed => e
+        return nil
+      end
+      
+    end
+    
+    def ask_for_ssh_password(user)
+      ask("Enter ssh password for user #{user}: ") { |q| q.echo = false }
     end
   end
 end

data/lib/railshoster/version.rb

@@ -1,3 +1,3 @@
 module Railshoster
-  VERSION = "0.6.9"
+  VERSION = "0.6.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railshoster
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13150620 !ruby/object:Gem::Requirement
+  requirement: &10310200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *13150620
+  version_requirements: *10310200
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &13150100 !ruby/object:Gem::Requirement
+  requirement: &10325700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13150100
+  version_requirements: *10325700
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &13149380 !ruby/object:Gem::Requirement
+  requirement: &10324600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13149380
+  version_requirements: *10324600
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &13148580 !ruby/object:Gem::Requirement
+  requirement: &10323840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *13148580
+  version_requirements: *10323840
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &13163980 !ruby/object:Gem::Requirement
+  requirement: &10323300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13163980
+  version_requirements: *10323300
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &13163100 !ruby/object:Gem::Requirement
+  requirement: &10322500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13163100
+  version_requirements: *10322500
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &13162440 !ruby/object:Gem::Requirement
+  requirement: &10321880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13162440
+  version_requirements: *10321880
 - !ruby/object:Gem::Dependency
   name: sane
-  requirement: &13161880 !ruby/object:Gem::Requirement
+  requirement: &10321300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13161880
+  version_requirements: *10321300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13161200 !ruby/object:Gem::Requirement
+  requirement: &10320740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13161200
+  version_requirements: *10320740
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &13160520 !ruby/object:Gem::Requirement
+  requirement: &10320160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13160520
+  version_requirements: *10320160
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &13160020 !ruby/object:Gem::Requirement
+  requirement: &10319420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13160020
+  version_requirements: *10319420
 description: Easily deploy your Rails app to RailsHoster.com by using this gem.
 email:
 - fischer@enterprise-rails.de
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4337555120511314870
+      hash: 196242856175491776
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4337555120511314870
+      hash: 196242856175491776
 requirements: []
 rubyforge_project: railshoster
 rubygems_version: 1.8.10