railshoster 0.0.3 → 0.0.4

data/CHANGELOG.textile

@@ -0,0 +1,29 @@
+h2. 0.0.1
+
+* Implementation of init command started.
+* Current status: 
+** Decode and parse credentials - done
+** Gather Git Repository URL using git gem - done
+** Write deploy.rb
+** Capify project
+
+h2. 0.0.2
+
+* deploy.rb now creates a symlink to database.yml with -f (force) and overwrites an eventually existing database.yml from the customer's repository.
+
+h3. 0.0.3
+
+* Added travis testing meta data.
+* Added RSpec tests for basic functionality.
+* Fixed a Ruby 1.9.x issue.
+* Enhanced error messages for invalid application tokens.
+* Initial README.
+
+h3. 0.1.0
+
+* Added Railshoster Bundler settings to generate binstubs. Hence you don't have to use "bundle exec" all the time. See http://gembundler.com/deploying.html for more details.
+* Bugfix reagarding to keyboard input when no directory is given.
+* Added capistrano task "railshoster:appurl" to show the default railshoster app url.
+* "railshoster deploy" now can only be invoked if there's a Capfile and a deploy.rb.
+* Added "railshoster appurl" show the default railshoster app url. This command can only be invoked if there's a Capfile and a deploy.rb.
+* It now shows the appurl after invoking "railshoster deploy".

data/{README.markdown → README.textile}

@@ -4,7 +4,7 @@ The RailsHoster Deployment gem helps you to easily get your Rails app runing at
 
 h2. Travis Status of the current dev branch
 
-[![Build Status](https://secure.travis-ci.org/[railshoster]/[railshoster].png)](http://travis-ci.org/[railshoster]/[railshoster])
+"!https://secure.travis-ci.org/railshoster/railshoster.png!":http://travis-ci.org/railshoster/railshoster
 
 h2. Requirements
 
@@ -18,19 +18,19 @@ This is what you need on your client to run the RailsHoster gem to deploy your a
 
 h2. Installation
 
-    gem install railshoster
+bc. gem install railshoster
 
 h2. Usage
  
 Simply go to your project's git folder and invoke the following command to initialize your app and *make it deployment ready*.
 
-    railshoster init -a 'your application token' .
+bc. railshoster init -a 'your application token' .
 
-Regarding to your *application token* please refer to your account information you have received after signing up at [RailsHoster.com](http://www.railshoster.com/).
+Regarding to your *application token* please refer to your account information you have received after signing up at "!RailsHoster.com":http://www.railshoster.com/.
 
 You can then either use *capistrano* to deploy or invoke
 
-    railshoster deploy
+bc. railshoster deploy
 
 It's as easy as this. Refer to the RailsHoster.com Support if any problems raise. We are happy to help you.
 
@@ -38,4 +38,4 @@ h2. Debug
 
 In order to receive full stack traces when exceptions occure just pass a environment variable like this
 
-    RAILSHOSTER_DEV=1 railshoster 
+bc. RAILSHOSTER_DEV=1 railshoster 

data/bin/railshoster

@@ -35,7 +35,7 @@ command [:init] do |c|
     project_git_dir_name = args[0] || cwd
         
     init_command = Railshoster::InitCommand.new(project_git_dir_name)
-    init_command.run_by_application_token(options[:a])
+    init_command.run_by_application_token(options[:a])    
   end
 end
 
@@ -46,6 +46,19 @@ command [:deploy] do |c|
   c.action do |global_options,options,args|
     project_git_dir_name = args[0] || FileUtils.pwd
     Railshoster::DeployCommand.new(project_git_dir_name).deploy
+    
+    puts "\nNow, where you have deployed your app you might want to have a look at it. You can find it here:"
+    
+    Railshoster::AppUrlCommand.new(project_git_dir_name).show
+  end
+end
+
+desc "Show the default RailsHoster.com URL for your app."
+long_desc "Whenever you ask what the initial RailsHoster.com URL of your app was just invoke this command. It will tell you."
+command [:appurl] do |c|
+  c.action do |global_options,options,args|
+    project_git_dir_name = args[0] || FileUtils.pwd
+    Railshoster::AppUrlCommand.new(project_git_dir_name).show
   end
 end
 
@@ -92,8 +105,8 @@ def ask_for_project_dir(current_working_dir)
   puts "You have not specified your local project folder to be deployed.\n" +
     "I assume you want to use your current working directory: #{current_working_dir}.\n"
   print "Correct? (y/n) [n]: "
-  decision = STDIN.getc
-  if decision !~ /y/i then
+  decision = STDIN.gets.chomp
+  unless %w(y Y).include?(decision) then
     exit_now!("Initialization aborted.", -1)
   end      
 end

data/lib/railshoster/app_url_command.rb

@@ -0,0 +1,12 @@
+module Railshoster
+  
+  # This action class shows the default railshoster.com url of a project.
+  class AppUrlCommand < Command
+    
+    def show
+      if_project_already_initialized do
+        system("cap railshoster:appurl")
+      end
+    end
+  end
+end

data/lib/railshoster/command.rb

@@ -22,5 +22,26 @@ module Railshoster
     def capfile_path 
       File.join(@project_dir, "Capfile")
     end
+    
+    def deployrb_exists?
+      File.exists?(deployrb_path)
+    end
+    
+    def deployrb_path
+      File.join(@project_dir, "config", "deploy.rb")
+    end
+    
+    def if_project_already_initialized(&block)
+      if project_already_initialized? then
+        yield
+      else
+        puts "\nCommand execution aborted!\nYou haven't initialized your application, yet." 
+        puts "Please use the 'railshoster init' command and try again.\n\n"
+      end
+    end      
+    
+    def project_already_initialized?
+      (capfile_exists? and deployrb_exists?)
+    end
   end
 end

data/lib/railshoster/deploy_command.rb

@@ -1,6 +1,6 @@
 module Railshoster
   
-  # This action class helps to setup a new rails applicaton
+  # This action class helps to deploy a rails applicaton
   class DeployCommand < Command
     
     def initialize(project_dir)
@@ -8,11 +8,8 @@ module Railshoster
     end
     
     def deploy
-      if capfile_exists? then
+      if_project_already_initialized do
         system("cap deploy")
-      else
-        puts "\nDeployment abortet!\nYou haven't initialized your application, yet." 
-        puts "Please use the 'railshoster init' command as described in your account information mail you have received from RailsHoster.com and try again.\n\n"
       end
     end
   end

data/lib/railshoster/version.rb

@@ -1,3 +1,3 @@
 module Railshoster
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/railshoster.rb

@@ -9,6 +9,7 @@ require File.join(File.dirname(__FILE__), 'railshoster/bad_application_json_hash
 require File.join(File.dirname(__FILE__), 'railshoster/bad_appliction_token_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')
 
 module Railshoster
 end

data/templates/h/deploy.rb.erb

@@ -44,19 +44,20 @@ default_run_options[:pty] = true
 set :use_sudo, false
 
 # set the location where to deploy the new project
-set :deploy_to, "/home/#{user}/#{application}"
+set :deploy_to, "/home/#{user}/#{application}/shared/bundle"
 
 # live
 role :app, "<%= app["h"]%>"
 role :web, "<%= app["h"]%>"
 role :db,  "<%= app["h"]%>", :primary => true
 
+# railshoster bundler settings
+set :bundle_flags, "--deployment --binstubs"
 
 ############################################
 # Default Tasks by RailsHoster.de
 ############################################
 namespace :deploy do
-
   desc "Restarting mod_rails with restart.txt"
   task :restart, :roles => :app, :except => { :no_release => true } do
     run "touch #{current_path}/tmp/restart.txt"
@@ -66,6 +67,15 @@ namespace :deploy do
   task :additional_symlink, :roles => :app do
     run "ln -sf #{shared_path}/config/database.yml #{current_path}/config/database.yml"
   end
+end
 
+namespace :railshoster do
+  desc "Show the url of your app."
+  task :appurl do
+    puts "\nThe default RailsHoster.com URL of your app is:"
+    puts "\nhttp://#{user}-<%= app["aid"] %>.<%= app["h"]%>"    
+    puts "\n"
+  end
 end
+
 after "deploy:symlink","deploy:additional_symlink","deploy:migrate"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railshoster
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Julian Fischer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-05 00:00:00 Z
+date: 2011-11-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -143,15 +143,16 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .travis.yml
-- CHANGELOG.markdown
+- CHANGELOG.textile
 - CONTRIB.txt
 - LICENSE
-- README.markdown
-- ROADMAP.markdown
+- README.textile
+- ROADMAP.textile
 - Rakefile
 - bin/railshoster
 - gemfiles/Gemfile.ci
 - lib/railshoster.rb
+- lib/railshoster/app_url_command.rb
 - lib/railshoster/bad_application_json_hash_error.rb
 - lib/railshoster/bad_appliction_token_error.rb
 - lib/railshoster/capify_project_failed_error.rb

data/CHANGELOG.markdown

@@ -1,20 +0,0 @@
-h2. 0.0.1
-
-* Implementation of init command started.
-* Current status: 
-** Decode and parse credentials - done
-** Gather Git Repository URL using git gem - done
-** Write deploy.rb
-** Capify project
-
-h2. 0.0.2
-
-* deploy.rb now creates a symlink to database.yml with -f (force) and overwrites an eventually existing database.yml from the customer's repository.
-
-h3. 0.0.3
-
-* Added travis testing meta data.
-* Added RSpec tests for basic functionality.
-* Fixed a Ruby 1.9.x issue.
-* Enhanced error messages for invalid application tokens.
-* Initial README.