rsm 0.1 → 0.1.1

data/CHANGES.md

@@ -1,3 +1,9 @@
+# 0.1.1 / September 04, 2011
+
+  * Added `rsm:bundle:install` and `rsm:bundle:update` tasks
+  * Added `--verbose` [`-V`] option
+  * Default destionation root is application root
+
 # 0.1 / September 03, 2011
 
   * Added support of auth_basic in Nginx config

data/README.md

@@ -13,6 +13,7 @@ This version can:
   * clone from Git repo or download and unpack Rails application from TGZ or TBZ2 archive
   * generate Unicorn config from template
   * start and stop unicorn server
+  * run bundle install and update
 
 Homepage
 --------

data/VERSION

@@ -1 +1 @@
-0.1
+0.1.1

data/lib/rsm/actions.rb

@@ -2,6 +2,29 @@ module Rsm
   module Actions
     TAR_OPTS = {:gz => '-z', :bz2 => '-j'}.freeze
 
+    def application_root
+      unless @application_root
+        @application_root = if options[:capistrano]
+          "#{options[:apps_root]}/#{name}/#{options[:capistrano]}/current"
+        else
+          "#{options[:apps_root]}/#{name}"
+        end
+        @application_root = Pathname.new(@application_root)
+        say "Application root: #{@application_root}" if options[:verbose]
+      end
+      @application_root
+    end
+
+    def run_ruby_binary(command, config = {})
+      rvmrc = application_root.join(".rvmrc")
+      with = if rvmrc.exist?
+        File.new(rvmrc).readline.strip + " exec"
+      else
+        "#{Thor::Util.ruby_command} -S"
+      end
+      run(command, config.merge(:with => with))
+    end
+
     # relative downloaded filename
     # *name*:: application name
     # *compressor*:: +:gz+ or +:bz2+

data/lib/rsm/base.rb

@@ -10,28 +10,18 @@ module Rsm
     class_option :apps_root, :default => "/var/www", :aliases => "-r", :desc => "Rails apps root"
     class_option :capistrano, :default => false, :aliases => "-c", :desc => "Application's Capistrano stage"
 
+    class_option :verbose, :default => false, :aliases => "-V", :desc => "Verbose output"
 
     def self.template_path
       Thor::Util.snake_case(name.to_s).squeeze(":").gsub(":", "/")
     end
-    
+
     def self.source_root
       File.expand_path("../../../templates/#{template_path}", __FILE__)
     end
 
-    def application_root
-      unless @application_root
-        @application_root = if options[:capistrano]
-          "#{options[:apps_root]}/#{name}/#{options[:capistrano]}/current"
-        else
-          "#{options[:apps_root]}/#{name}"
-        end
-        @application_root = Pathname.new(@application_root)
-        say "Application root: #{@application_root}"
-      end
-      @application_root
+    def set_destination_root
+      self.destination_root = application_root.to_s
     end
-    remove_task :application_root
-
   end
 end

data/lib/tasks/bundle/install.rb

@@ -0,0 +1,18 @@
+module Rsm
+  module Bundle
+    class Install < Rsm::Base
+      class_option :deployment, :aliases => "-D", :type => :boolean, :default => false, :desc => "Use deployment mode"
+      class_option :without, :desc => "Pass to --without bundler's option"
+
+      def check_and_install
+        bundle_install = "bundle install"
+        bundle_install << " --deployment" if options[:deployment]
+        bundle_install << " --without #{options[:without]}" if options[:without]
+        inside "." do
+          run_ruby_binary "bundle check || #{bundle_install}"
+        end
+      end
+
+    end
+  end
+end

data/lib/tasks/bundle/update.rb

@@ -0,0 +1,13 @@
+module Rsm
+  module Bundle
+    class Update < Rsm::Base
+
+      def update
+        inside "." do
+          run_ruby_binary "bundle update"
+        end
+      end
+
+    end
+  end
+end

data/lib/tasks/install/rails.rb

@@ -12,10 +12,6 @@ module Rsm
 
       class_option :worker_processes, :type => :numeric, :default => 2, :aliases => "-w", :desc => "Worker processes for use in Unicorn"
 
-      def set_destination_root
-        self.destination_root = application_root.to_s
-      end
-
       def download
         empty_directory "."
         inside application_root do

data/lib/tasks/unicorn/start.rb

@@ -2,17 +2,11 @@ module Rsm
   module Unicorn
     class Start < Rsm::Base
       class_option :environment, :aliases => "-e", :default => "production"
-  
+
       def unicorn_rails
-        rvmrc = application_root.join(".rvmrc")
-        if rvmrc.exist?
-          ruby_cmd = File.new(rvmrc).readline.strip + " exec"
-        else
-          ruby_cmd = "#{Thor::Util.ruby_command} -S"
-        end
-        run "#{ruby_cmd} unicorn_rails -D -E #{options[:environment]} -c #{application_root.join("config", "unicorn.rb")}"
+        run_ruby_binary "unicorn_rails -D -E #{options[:environment]} -c #{application_root.join("config", "unicorn.rb")}"
       end
-      
+
     end
   end
 end

data/lib/tasks/unicorn/stop.rb

@@ -1,12 +1,13 @@
 module Rsm
   module Unicorn
     class Stop < Rsm::Base
-  
+
       def unicorn_rails
-        pidfile = application_root.join("tmp", "pids", "unicorn.pid")
-        run "kill $(cat #{pidfile})"
+        inside "." do
+          run "kill $(cat tmp/pids/unicorn.pid)"
+        end
       end
-      
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsm
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-03 00:00:00.000000000Z
+date: 2011-09-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &72172910 !ruby/object:Gem::Requirement
+  requirement: &81380070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *72172910
+  version_requirements: *81380070
 description: Thor tasks for rapid deployment new rails apps on server
 email: a.ulyanitsky@gmail.com
 executables:
@@ -44,6 +44,8 @@ files:
 - lib/rsm/base.rb
 - lib/rsm/runner.rb
 - lib/rsm/version.rb
+- lib/tasks/bundle/install.rb
+- lib/tasks/bundle/update.rb
 - lib/tasks/install/nginx.rb
 - lib/tasks/install/rails.rb
 - lib/tasks/unicorn/start.rb