railshoster 0.6.3 → 0.6.8

data/CHANGELOG.textile

@@ -73,3 +73,19 @@ h3. 0.6.1
 h3. 0.6.3
 
 * Updated message when there's no compatible database gem in Gemfile.lock.
+
+h3. 0.6.4
+
+* Fixed bug that the database.yml will link to the right release
+
+h3. 0.6.5
+
+* Process the asset pipeline if it is supported by the rails version
+
+h3. 0.6.6
+
+* Detection whether the Gemfile and Femfile.lock exists
+
+h3. 0.6.7
+
+* Get an error if no ssh key or ssh-direcotry exists

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    railshoster (0.6.2)
+    railshoster (0.6.6)
       bundler (>= 1.0.15)
       capistrano
       capistrano-ext
@@ -26,7 +26,7 @@ GEM
     erubis (2.7.0)
     fakefs (0.4.0)
     git (1.2.5)
-    gli (1.3.3)
+    gli (1.5.1)
     highline (1.6.11)
     json (1.6.5)
     metaclass (0.0.1)
@@ -39,7 +39,7 @@ GEM
     net-ssh (2.3.0)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    os (0.9.4)
+    os (0.9.6)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -48,7 +48,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    sane (0.24.6)
+    sane (0.25.3)
       os
 
 PLATFORMS

data/bin/railshoster

@@ -36,6 +36,11 @@ command [:init] do |c|
     project_git_dir_name = args[0] || cwd
     
     if options[:a] then
+      
+      while options[:a].include?('\\n') 
+        options[:a] = options[:a].gsub('\\n', "\n")
+      end
+
       Railshoster::InitCommand.run_by_application_token(project_git_dir_name, options[:a])    
     elsif options[:j] then
       Railshoster::InitCommand.new(project_git_dir_name, options[:j]).start
@@ -139,4 +144,4 @@ def ask_for_project_dir(current_working_dir)
   end      
 end
 
-exit GLI.run(ARGV)
+exit GLI.run(ARGV)

data/lib/railshoster/init_command.rb

@@ -61,6 +61,7 @@ module Railshoster
     protected
     
     def process_application_hash
+      expand_app_hash
       expand_app_hash_product_specifically
       # e.g. mysql2
       @app_hash["db_gem"] = get_db_gem.name
@@ -76,23 +77,35 @@ module Railshoster
       create_remote_authorized_key_file_from_app_hash(@app_hash, selected_key)      
       
       @app_hash["remote_db_yml"]  = "#{@app_hash["deploy_to"]}/shared/config/database.yml"
-      update_database_yml_db_adapters_via_ssh
+
+      @app_hash["h"].each do |host|
+        update_database_yml_db_adapters_via_ssh(host)
+      end
       
       deployrb_str = create_deployrb(@app_hash)      
       write_deploy_rb(deployrb_str)
       capify_project
       success_message
     end
+
+    def expand_app_hash
+
+      # Turn "h" in to an array unless it's not already one.
+      @app_hash["h"] = [ @app_hash["h"] ] unless @app_hash["h"].is_a?(Array)
+    end
     
     # Add values ot app_hash specific to the given product type.
-    def expand_app_hash_product_specifically            
+    def expand_app_hash_product_specifically
       case @app_hash["t"].to_sym
         when :h
           @app_hash["deploy_to"]      = "/home/#{@app_hash['u']}/#{@app_hash['a']}"
           @app_hash["app_url"]        = "http://#{@app_hash['u']}-#{@app_hash['aid']}.#{@app_hash['h']}"
         when :v
-          @app_hash["deploy_to"]      = "/var/www/#{@app_hash['a']}"                       
+          @app_hash["deploy_to"]      = "/var/www/#{@app_hash['a']}"
           @app_hash["app_url"]        = "http://#{@app_hash['a']}.#{@app_hash['h']}"
+        when :pc 
+          @app_hash["deploy_to"]      = "/var/www/#{@app_hash['a']}"
+          @app_hash["app_url"]        = "http://#{@app_hash['au']}"
         else
           raise UnsupportedApplicationTypeError.new
       end

data/lib/railshoster/init_database_helpers.rb

@@ -10,7 +10,7 @@ module Railshoster
     protected
     
     # Receive and update a database.yml via SFTP.
-    def update_database_yml_db_adapters_via_ssh(host = @app_hash["h"], ssh_username = @app_hash["u"], path_to_dbyml = @app_hash["remote_db_yml"])
+    def update_database_yml_db_adapters_via_ssh(host, 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|
@@ -50,4 +50,4 @@ module Railshoster
       dbyml
     end          
   end
-end
+end

data/lib/railshoster/init_ssh_helpers.rb

@@ -9,19 +9,26 @@ module Railshoster
       if app_hash["t"].eql?("h") then
         
         # For a hosting package the password is the deploy user's password
-        create_remote_authorized_key_file(app_hash["h"], app_hash["u"], app_hash["p"], key)
+        create_remote_authorized_key_file(app_hash["h"].first, app_hash["u"], app_hash["p"], key)
       elsif app_hash["t"].eql?("v") then
         
         # For a vps the given password it the root user's password -> Register key for root user
-        create_remote_authorized_key_file(app_hash["h"], "root", app_hash["p"], key)        
+        create_remote_authorized_key_file(app_hash["h"].first, "root", app_hash["p"], key)        
         
         # Also register the public key to enable key access to the deploy user  
-        create_remote_authorized_key_file(app_hash["h"], "root", app_hash["p"], key, "/home/#{app_hash['u']}/.ssh", app_hash['u'])        
+        create_remote_authorized_key_file(app_hash["h"].first, "root", app_hash["p"], key, "/home/#{app_hash['u']}/.ssh", app_hash['u'])        
+      elsif app_hash["t"].eql?("pc") then
+
+        # For a private cloud setup we act on several vps
+        # but in this case the app_hash stores the deploy user's password not the root password as for vps setups
+        app_hash["h"].each do |host|
+           create_remote_authorized_key_file(host, app_hash["u"], app_hash["p"], key)
+        end
       else
         raise("Initialization aborted. Invalid product type: #{app_hash['t']}.")
-      end            
-    end     
-    
+      end
+    end
+
     # Creates a remote authorized keys file for the given public key
     #
     # === Parameters
@@ -37,7 +44,7 @@ module Railshoster
 
         #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
@@ -50,4 +57,4 @@ module Railshoster
       end      
     end
   end
-end
+end

data/lib/railshoster/no_ssh_key_given_error.rb

@@ -0,0 +1,5 @@
+module Railshoster
+  class NoSshKeyGivenError < ArgumentError
+    include Railshoster::Error
+  end
+end

data/lib/railshoster/utilities.rb

@@ -32,6 +32,11 @@ module Railshoster
     
     def self.select_public_ssh_key(ssh_dir =  File.join(get_user_home, ".ssh"), options = {:verbose => true})
       keys = Railshoster::Utilities.find_public_ssh_keys(ssh_dir, options)
+      
+      if keys.size == 0 
+        raise NoSshKeyGivenError.new("No SSH key given. Use the ssh-keygen command to generate one.")
+      end
+      
       return keys.first if keys.size == 1
 
       puts "\nThere are multiple public ssh keys. Please choose your deploy key:"

data/lib/railshoster/version.rb

@@ -1,3 +1,3 @@
 module Railshoster
-  VERSION = "0.6.3"
+  VERSION = "0.6.8"
 end

data/lib/railshoster.rb

@@ -8,6 +8,7 @@ require File.join(File.dirname(__FILE__), 'railshoster/capify_project_failed_err
 require File.join(File.dirname(__FILE__), 'railshoster/bad_application_json_hash_error')
 require File.join(File.dirname(__FILE__), 'railshoster/bad_appliction_token_error')
 require File.join(File.dirname(__FILE__), 'railshoster/invalid_public_ssh_key_error')
+require File.join(File.dirname(__FILE__), 'railshoster/no_ssh_key_given_error')
 require File.join(File.dirname(__FILE__), 'railshoster/init_command')
 require File.join(File.dirname(__FILE__), 'railshoster/deploy_command')
 require File.join(File.dirname(__FILE__), 'railshoster/app_url_command')

data/spec/lib/railshoster/utilities_spec.rb

@@ -75,6 +75,11 @@ describe Railshoster::Utilities do
       keys.first[:key_data].should eql("AAAAB3NzaC1yc2EAAAADAQABAAABAQDwnMABQ9xWwYdhHaaoNSzFMfXmytWHgkBmDg6v8Fn3oILqOMs99IPd7ChPetDdUWYV2pzLVVKB/kwrcoodRC4H6YHn8xk1oI+gDsv4Yg7ytWwgnDf5zXwWMVQ/IqfOdfxRwS1UCrKL7UsVfIUPzXmkia7PoMoQNnM8jbDRDcfyis3Q1VZ9OjIlM/RfqjH0hGFS95nd6geNwpSbSpg4HxNmfltQ6GpoqclQXX0QdBO+q93sn33JjFPEhYuLvQcoea7Tl0zRY0AGQ9r7562QFlWqMmB+9YXcsZu2OZSk7t5a39jral0jEuEeJB56kb5ZUqRA1DJI5En09/WUPLCYprdb")
     end
     
+    it "should be 0 ssh-keys if the ssh-directory doesn't exists" do
+      keys = Railshoster::Utilities.find_public_ssh_keys(File.join(File.dirname(__FILE__), "..", "..", "fakefs", "fake_dot_ssh", "this_does_not_exist"), :verbose => false)
+      keys.size.should be(0)
+    end
+    
     it "should select a public ssh key without a dialog if there is only a single valid key" do 
       key = Railshoster::Utilities.select_public_ssh_key(File.join(File.dirname(__FILE__), "..", "..", "fakefs", "fake_dot_ssh", "1_valid_key"), :verbose => false)
       key[:format].should eql("ssh-rsa")

data/templates/h/deploy.rb.erb

@@ -6,9 +6,46 @@
 #
 ###############################
 
-# BITTE ENTFERNEN SIE DIE FOLGENDE ZEILE WENN SIE BUNDLER NICHT BENUTZEN
-require 'bundler/capistrano'
+def gemfile_exists? 
+  File.exists? "Gemfile"
+end
+
+def gemfile_lock_exists?
+  File.exists? "Gemfile.lock"
+end
+
+def rails_version
+  if gemfile_exists? 
+    rails_v = (Proc.new {
+      file = File.new("Gemfile", "r")
+      while (line = file.gets)
+        if line =~ /^\s*gem\s+[\"\']rails[\"\'].+/
+        version = line.scan(/(\d+)\.(\d+)\.(\d+)/).first.map {|x| x.to_i}
+      end
+    end
+    file.close
+    version
+    }).call
+  else 
+    rails_v = nil
+  end
+    return rails_v
+end
+
+def rails_version_supports_assets?
+  rails_v = rails_version
+  return rails_v != nil && rails_v[0] >= 3 && rails_v[1] >= 1
+end
 
+if gemfile_exists? && gemfile_lock_exists?
+  require 'bundler/capistrano'
+end
+
+#### Use the asset-pipeline
+
+if rails_version_supports_assets?
+  load 'deploy/assets'
+end
 
 #### Personal Settings
 ## User and Password
@@ -54,9 +91,12 @@ set :use_sudo, false
 set :deploy_to, "<%= app["deploy_to"] %>"
 
 # live
-role :app, "<%= app["h"]%>"
-role :web, "<%= app["h"]%>"
-role :db,  "<%= app["h"]%>", :primary => true
+<% app["h"].each do |ahost| %>
+  role :app, "<%= ahost %>"
+  role :web, "<%= ahost %>"
+<% end %>
+
+role :db,  "<%= app["h"].first %>", :primary => true
 
 # railshoster bundler settings
 set :bundle_flags, "--deployment --binstubs"
@@ -72,7 +112,7 @@ namespace :deploy do
 
   desc "Additional Symlinks ( database.yml, etc. )"
   task :additional_symlink, :roles => :app do
-    run "ln -sf #{shared_path}/config/database.yml #{current_path}/config/database.yml"
+    run "ln -sf #{shared_path}/config/database.yml #{release_path}/config/database.yml"
   end
 end
 
@@ -85,4 +125,10 @@ namespace :railshoster do
   end
 end
 
-after "deploy:symlink","deploy:additional_symlink","deploy:migrate"
+if rails_version_supports_assets?
+  before "deploy:assets:precompile", "deploy:additional_symlink"
+  after "deploy:create_symlink", "deploy:migrate"
+else
+  after "deploy:create_symlink", "deploy:additional_symlink", "deploy:migrate"
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railshoster
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Julian Fischer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 Z
+date: 2012-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -214,6 +214,7 @@ files:
 - lib/railshoster/init_ssh_helpers.rb
 - lib/railshoster/init_validation_helpers.rb
 - lib/railshoster/invalid_public_ssh_key_error.rb
+- lib/railshoster/no_ssh_key_given_error.rb
 - lib/railshoster/possibly_not_a_git_repo_error.rb
 - lib/railshoster/unsupported_application_type_error.rb
 - lib/railshoster/utilities.rb
@@ -264,22 +265,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: railshoster
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RailsHoster Applicatoin Deployment Suite
-test_files: 
-- spec/fakefs/bundler/mysql/Gemfile.lock
-- spec/fakefs/bundler/mysql2/Gemfile.lock
-- spec/fakefs/bundler/pg/Gemfile.lock
-- spec/fakefs/database_yml/database.mysql.yml
-- spec/fakefs/fake_dot_ssh/1_valid_key/bullshit.pub
-- spec/fakefs/fake_dot_ssh/1_valid_key/id_rsa.pub
-- spec/fakefs/fake_dot_ssh/2_valid_keys/github_rsa.pub
-- spec/fakefs/fake_dot_ssh/2_valid_keys/id_dsa.pub
-- spec/lib/railshoster/command_spec.rb
-- spec/lib/railshoster/init_command_spec.rb
-- spec/lib/railshoster/init_database_helpers_spec.rb
-- spec/lib/railshoster/init_gem_helpers_spec.rb
-- spec/lib/railshoster/utilities_spec.rb
-- spec/spec_helper.rb
+test_files: []
+