torquebox-remote-deployer 0.1.1 → 0.1.2.pre1

data/README.md

@@ -29,7 +29,7 @@ You'll need to configure it like this:
       hostname "localhost"
       port "2222"
       user "vagrant"
-      key "#{ENV["GEM_HOME"]}/gems/vagrant-0.8.7/keys/vagrant"
+      key "~/.vagrant.d/insecure_private_key"
       sudo true
     end
 
@@ -43,9 +43,9 @@ its root directory; like this:
 
     $ rake torquebox:remote:exec["bundle install --path vendor/bundle"]
 
-Now you can to do more useful things like running migrations:
+Or if you ran `bundle --deployment` before creating your Knob you can just jump right in and run something more useful like your migrations:
 
-    $ rake torquebox:remote:exec["rake db:migrate RAILS_ENV=production"]
+    $ rake torquebox:remote:exec["bundle exec rake db:migrate"]
 
 After the `exec` tasks are complete, you can deploy the Knob to the TorqueBox server.
 
@@ -53,8 +53,29 @@ After the `exec` tasks are complete, you can deploy the Knob to the TorqueBox se
 
 This task works just like the `torquebox:deploy:archive` task, but remotely.
 
+## Deploying to Multiple Environments
+
+The `torquebox-remote-deployer` gem defaults to production mode, so all the examples shown above will execute with your `production` Bundler group and db config.  But it's most likely that you will want to deploy to a staging or test environment before deploying to production.  In that case, you'll need a config file for each one.  In each config file, you can specify the RACK_ENV or RAILS_ENV like this:
+
+    TorqueBox::RemoteDeploy.configure do
+      torquebox_home "/opt/torquebox"
+      hostname "localhost"
+      port "2222"
+      user "vagrant"
+      key "~/.vagrant.d/insecure_private_key"
+
+      # set the RAILS_ENV on the remote server
+      rails_env "staging"
+    end
+
+Then you can deploy with the `TB_REMOTE_FILE` environment variable set like this:
+
+    $ export TB_REMOTE_FILE=config/torquebox_remote.staging.rb 
+    $ rake torquebox:remote:stage
+
+You can name the config file whatever you'd like, and you can have one per environment -- but use the same Rake tasks.
+
 ## TODO
 
 *  Make it friendly to remote Windows targets (already works on Windows source machines).
-*  Support deploying to mutliple servers (config would look like multi-hosts in a Vagrantfile)
 *  Support deploying over FTP or SFTP in addition to SCP/SSH.

data/lib/torquebox/remote_deploy_utils.rb

@@ -52,11 +52,10 @@ module TorqueBox
       def exec_ruby(archive_file, cmd)
         with_config(archive_file) do |config, app_name|
           unless config.local
-            # TODO set RACK_ENV based on env var, and default to production
             ssh_exec(config, "cd #{config.torquebox_home}/stage/#{app_name}",
                      "export PATH=$PATH:#{config.torquebox_home}/jruby/bin",
-                     "export RAILS_ENV=production",
-                     "export RACK_ENV=production",
+                     "export RAILS_ENV=#{config.rack_env}",
+                     "export RACK_ENV=#{config.rack_env}",
                      "#{config.torquebox_home}/jruby/bin/jruby -S #{cmd}")
           else
             # not sure what to do here yet
@@ -71,13 +70,12 @@ module TorqueBox
       end
 
       def do_deploy(config, app_name)
-        # TODO set RACK_ENV based on env var, and default to production
         knob_yml = <<-YAML
         application:
           root: #{config.jboss_home}/standalone/deployments/#{app_name}.knob
         environment:
-          RACK_ENV: production
-          RAILS_ENV: production
+          RACK_ENV: #{config.rack_env}
+          RAILS_ENV: #{config.rack_env}
         YAML
 
         unless config.local
@@ -88,6 +86,7 @@ module TorqueBox
           ssh_exec(config, "touch #{config.jboss_home}/standalone/deployments/#{app_name}-knob.yml.dodeploy")
         else
           # todo copy temp file to somewhere
+          File.open("#{config.jboss_home}/standalone/deployments/#{app_name}-knob.yml", "w") {}
           File.open("#{config.jboss_home}/standalone/deployments/#{app_name}-knob.yml.dodeploy", "w") {}
         end
       end
@@ -143,7 +142,7 @@ module TorqueBox
       end
 
       def read_config
-        config_file = ENV["CONFIG_FILE"] || ENV["config_file"] || "config/torquebox_remote.rb"
+        config_file = ENV["TB_REMOTE_FILE"] || ENV["tb_remote_file"] || "config/torquebox_remote.rb"
         eval(File.read(config_file)).configurations
       end
     end
@@ -202,11 +201,27 @@ module TorqueBox
     def host(&block)
       @configs << RemoteDeploy.new(block).config
     end
+
+    def rails_env(env)
+      @config.rack_env = env
+    end
+
+    def rack_env(env)
+      @config.rack_env = env
+    end
   end
 
   class RemoteConfig
     attr_accessor :hostname, :port, :user, :key, :torquebox_home, :sudo, :local
 
+    def rack_env=(env)
+      @rack_env = env
+    end
+
+    def rack_env
+      @rack_env || "production"
+    end
+
     def jboss_home=(jbh)
       @jboss_home = jbh
     end

data/spec/fixtures/simple_torquebox_remote.rb

@@ -4,4 +4,6 @@ TorqueBox::RemoteDeploy.configure do
   port "2222"
   user "torquebox"
   key "~/.ssh/id_rsa.pub"
+  rails_env "production"
+  rack_env "production"
 end

data/spec/remote_deploy_utils_spec.rb

@@ -8,14 +8,14 @@ describe TorqueBox::RemoteDeployUtils do
 
   describe ".stage" do
     it "stages one host" do
-      ENV["config_file"] = File.join(File.dirname(__FILE__), "fixtures/simple_torquebox_remote.rb")
+      ENV["tb_remote_file"] = File.join(File.dirname(__FILE__), "fixtures/simple_torquebox_remote.rb")
       @util.stub(:ssh_exec)
       @util.should_receive(:scp_upload).with(anything(), "myapp.knob", "/opt/torquebox/stage/myapp.knob")
       @util.stage("myapp.knob")
     end
 
     it "stages two hosts" do
-      ENV["config_file"] = File.join(File.dirname(__FILE__), "fixtures/multihost_torquebox_remote.rb")
+      ENV["tb_remote_file"] = File.join(File.dirname(__FILE__), "fixtures/multihost_torquebox_remote.rb")
       @util.stub(:ssh_exec)
       @util.should_receive(:scp_upload).with(anything(), "myapp.knob", "/my/tb/dir/stage/myapp.knob")
       @util.should_receive(:scp_upload).with(anything(), "myapp.knob", "/opt/torquebox/stage/myapp.knob")
@@ -24,7 +24,7 @@ describe TorqueBox::RemoteDeployUtils do
 
     context "local" do
       it "stages" do
-        ENV["config_file"] = File.join(File.dirname(__FILE__), "fixtures/local_torquebox_remote.rb")
+        ENV["tb_remote_file"] = File.join(File.dirname(__FILE__), "fixtures/local_torquebox_remote.rb")
         @util.stage("myapp.knob")  # does nothing
       end
     end
@@ -41,10 +41,13 @@ describe TorqueBox::RemoteDeployUtils do
       end
 
       it "deploys" do
-        ENV["config_file"] = File.join(File.dirname(__FILE__), "fixtures/local_torquebox_remote.rb")
+        ENV["tb_remote_file"] = File.join(File.dirname(__FILE__), "fixtures/local_torquebox_remote.rb")
         @util.deploy(File.join(File.dirname(__FILE__), "fixtures/myapp.knob"))
         File.exists?("#{deploy_dir}/myapp.knob").should == true
-        File.exists?("#{deploy_dir}/myapp.knob.dodeploy").should == true
+
+        # this isn't really testing the real deal yet
+        File.exists?("#{deploy_dir}/myapp-knob.yml").should == true
+        File.exists?("#{deploy_dir}/myapp-knob.yml.dodeploy").should == true
       end
 
       def deploy_dir

data/torquebox-remote-deployer.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "torquebox-remote-deployer"
-  s.version     = "0.1.1"
+  s.version     = "0.1.2.pre1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Joe Kutner"]
   s.email       = ["jpkutner@gmail.com"]

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: torquebox-remote-deployer
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.1
+  prerelease: 6
+  version: 0.1.2.pre1
 platform: ruby
 authors: 
   - Joe Kutner
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-24 00:00:00 Z
+date: 2012-05-08 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl
@@ -108,9 +108,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: torquebox-remote-deployer