ors 0.2.3 → 0.2.4

data/lib/ors/commands/help.rb

@@ -9,12 +9,13 @@ Usage: ./ors <action> [environment=production] [options]
 === Actions
 changes       View changes between what is deployed and committed
 check         Prints out contents of restart.timestamp on the app servers
-console       Bring up a console on the production servers
+console       Bring up a console on the console server
 deploy        Update the code, run the migrations, and restart unicorn
 help          You're looking at it
 logs          Show the last few log entries from the production servers
 migrate       Runs the migrations on the migration server
 restart       Retarts unicorn on the app servers
+runner        Runs ruby code via Rails' runner on the console server
 setup         Sets up the default environment on the servers
 start         Starts up unicorn on the app servers
 stop          Stops unicorn on the app servers

data/lib/ors/commands/runner.rb

@@ -0,0 +1,35 @@
+module ORS::Commands
+  class Runner < Base
+    def execute
+      begin
+        code = ORS::Config.options[ ORS::Config.options.index{|e| e =~ /^(-c|--code)$/} + 1 ]
+        raise if code.strip.empty?
+      rescue
+        fatal "ERROR: Missing option --code 'ruby code'."
+      end
+      results = execute_command console_server,
+                      %(source ~/.rvm/scripts/rvm),
+                      %({ cd #{deploy_directory} > /dev/null; }), # Silence RVM's "Using... gemset..."
+                      %(if [ -f script/rails ]; then bundle exec rails runner -e #{environment} \\"#{code}\\"; else ./script/runner -e #{environment} \\"#{code}\\"; fi),
+                      :capture => true, :quiet_ssh => true
+      results.sub!(/\AUsing BufferedLogger due to exception: .*?\n/, '') # The central_logger gem spits this out without any way of shutting it up
+      puts results
+    end
+
+    def help
+      puts <<-END
+Usage: ./ors runner [environment=production] --code "ruby code here" [options]
+
+=== Description
+Runs rails runner returning the result on STDOUT.
+The ruby code will be transmitted within several nested quotes:  '"\"ruby code here\""'
+Keep that in mind if you need to use quotes.
+
+=== Options
+--code       (or -c)   The code to run.
+--pretend    (or -p)   Don't execute anything, just show me what you're going to do
+--no-gateway (or -ng)  Don't use a gateway (if you're inside the firewall)
+      END
+    end
+  end
+end

data/lib/ors/helpers.rb

@@ -79,9 +79,9 @@ module ORS
       end.map {|thread| thread.join }
     end
 
-    # options = {:exec => ?, :capture => ?}
+    # options = {:exec => ?, :capture => ?, :quiet_ssh => ?}
     def execute_command server, *command_array
-      options = {:exec => false, :capture => false}
+      options = {:exec => false, :capture => false, :quiet_ssh => false}
       options.merge!(command_array.pop) if command_array.last.is_a?(Hash)
       options[:local] = true if server.to_s == "localhost"
 
@@ -118,14 +118,15 @@ module ORS
 
       commands = command_array.join " && "
       psuedo_tty = options[:exec] ? '-t ' : ''
+      quiet_ssh = options[:quiet_ssh] ? '-q ' : ''
 
       if options[:local]
         commands
       else
         if use_gateway
-          %(ssh #{psuedo_tty}#{gateway} 'ssh #{psuedo_tty}#{deploy_user}@#{server} "#{commands}"')
+          %(ssh #{quiet_ssh}#{psuedo_tty}#{gateway} 'ssh #{quiet_ssh}#{psuedo_tty}#{deploy_user}@#{server} "#{commands}"')
         else
-          %(ssh #{psuedo_tty}#{deploy_user}@#{server} "#{commands}")
+          %(ssh #{quiet_ssh}#{psuedo_tty}#{deploy_user}@#{server} "#{commands}")
         end
       end
     end

data/lib/ors/version.rb

@@ -1,3 +1,3 @@
 module ORS
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/ors/commands/runner_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+
+describe ORS::Commands::Runner do
+
+  context "#run" do
+    before do
+      stub(subject).name {'abc/growhealthy'}
+      stub(subject).environment {'production'}
+    end
+
+    it "should require --code 'ruby code'" do
+      lambda {subject.execute}.should raise_error
+    end
+
+    it "should require an argument to --code" do
+      ORS::Config.parse_options %w(--code)
+      lambda {subject.execute}.should raise_error
+    end
+
+    it "should require an argument to -c" do
+      ORS::Config.parse_options %w(--c)
+      lambda {subject.execute}.should raise_error
+    end
+
+    it "should require a non-empty argument to --code" do
+      ORS::Config.parse_options ['--code', ' ']
+      lambda {subject.execute}.should raise_error
+    end
+
+    it "should be successful with an argument to --code" do
+      ORS::Config.parse_options %w(--code true)
+      mock(subject).execute_command(is_a(String), is_a(String), is_a(String), is_a(String), is_a(Hash)).returns("results")
+      lambda {subject.execute}.should_not raise_error
+    end
+
+    it "should be successful with an argument to -c" do
+      ORS::Config.parse_options %w(-c true)
+      mock(subject).execute_command(is_a(String), is_a(String), is_a(String), is_a(String), is_a(Hash)).returns("results")
+      lambda {subject.execute}.should_not raise_error
+    end
+  end
+end

data/spec/ors/helpers_spec.rb

@@ -52,6 +52,10 @@ describe ORS::Helpers do
       it "should build the command with psuedo tty" do
         subject.build_command("server", %(cd /tmp), :exec => true).should == %(ssh -t deploy-gateway 'ssh -t deployer@server "cd /tmp"')
       end
+
+      it "should build the command with quiet mode" do
+        subject.build_command("server", %(cd /tmp), :quiet_ssh => true).should == %(ssh -q deploy-gateway 'ssh -q deployer@server "cd /tmp"')
+      end
     end
 
     context "without gateway" do
@@ -64,6 +68,10 @@ describe ORS::Helpers do
       it "should build the command with psuedo tty" do
         subject.build_command("server", %(cd /tmp), :exec => true).should == %(ssh -t deployer@server "cd /tmp")
       end
+
+      it "should build the command with quiet mode" do
+        subject.build_command("server", %(cd /tmp), :quiet_ssh => true).should == %(ssh -q deployer@server "cd /tmp")
+      end
     end
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ors
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jason Dew and John Long
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -04:00
+date: 2011-09-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -40,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -54,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -90,6 +76,7 @@ files:
 - lib/ors/commands/logs.rb
 - lib/ors/commands/migrate.rb
 - lib/ors/commands/restart.rb
+- lib/ors/commands/runner.rb
 - lib/ors/commands/setup.rb
 - lib/ors/commands/start.rb
 - lib/ors/commands/stop.rb
@@ -108,6 +95,7 @@ files:
 - spec/ors/commands/deploy_spec.rb
 - spec/ors/commands/help_spec.rb
 - spec/ors/commands/logs_spec.rb
+- spec/ors/commands/runner_spec.rb
 - spec/ors/commands/update_spec.rb
 - spec/ors/config_spec.rb
 - spec/ors/helpers_spec.rb
@@ -127,23 +115,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ors
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Heroku-like deployment utilities for ORS
@@ -155,6 +137,7 @@ test_files:
 - spec/ors/commands/deploy_spec.rb
 - spec/ors/commands/help_spec.rb
 - spec/ors/commands/logs_spec.rb
+- spec/ors/commands/runner_spec.rb
 - spec/ors/commands/update_spec.rb
 - spec/ors/config_spec.rb
 - spec/ors/helpers_spec.rb