cocaine 0.4.2 → 0.5.0

data/Gemfile

@@ -1,3 +1,7 @@
 source 'http://rubygems.org'
 
 gemspec
+
+platforms :ruby do
+  gem "posix-spawn"
+end

data/LICENSE

@@ -3,7 +3,7 @@ LICENSE
 
 The MIT License
 
-Copyright (c) 2011-2012 Jon Yurek and thoughtbot, inc.
+Copyright (c) 2011-2013 Jon Yurek and thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,3 +1,13 @@
+New for 0.5.0:
+
+* Updated the copyrights to 2013
+* Added UTF encoding markers on code files to ensure they're interpreted as
+  UTF-8 instead of ASCII.
+* Swapped the ordering of the PATH and supplemental path. A binary in the
+  supplemental path will take precedence, now.
+* Errors contain the output of the erroring command, for inspection.
+* Use climate_control instead for environment management.
+
 New for 0.4.2:
 
 * Loggers that don't understand `tty?`, like `ActiveSupport::BufferedLogger`

data/README.md

@@ -135,7 +135,7 @@ one of the `.spawn` runners don't work for you, you can override them manually
 by setting a new runner, like so:
 
 ```ruby
-Cocaine::CommandLine.runner = Cocaine::BackticksRunner.new
+Cocaine::CommandLine.runner = Cocaine::CommandLine::BackticksRunner.new
 ```
 
 And if you really want to, you can define your own Runner, though I can't
@@ -173,7 +173,7 @@ Question? Idea? Problem? Bug? Comment? Concern? Like using question marks?
 
 ## License
 
-Copyright 2011-2012 Jon Yurek and thoughtbot, inc. This is free software, and
+Copyright 2011-2013 Jon Yurek and thoughtbot, inc. This is free software, and
 may be redistributed under the terms specified in the
 [LICENSE](https://github.com/thoughtbot/cocaine/blob/master/LICENSE)
 file.

data/cocaine.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency('climate_control', '>= 0.0.3', '< 1.0')
   s.add_development_dependency('rspec')
   s.add_development_dependency('bourne')
   s.add_development_dependency('mocha')
   s.add_development_dependency('rake')
-  s.add_development_dependency('posix-spawn')
   s.add_development_dependency('active_support')
   s.add_development_dependency('pry')
 end

data/lib/cocaine.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 require 'rbconfig'
 require 'cocaine/command_line'
 require 'cocaine/command_line/runners'

data/lib/cocaine/command_line.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 module Cocaine
   class CommandLine
     class << self
@@ -6,10 +8,11 @@ module Cocaine
       def path
         @supplemental_path
       end
+
       def path=(supplemental_path)
         @supplemental_path = supplemental_path
         @supplemental_environment ||= {}
-        @supplemental_environment['PATH'] = [ENV['PATH'], *supplemental_path].join(File::PATH_SEPARATOR)
+        @supplemental_environment['PATH'] = [*supplemental_path, ENV['PATH']].join(File::PATH_SEPARATOR)
       end
 
       def posix_spawn_available?
@@ -45,6 +48,7 @@ module Cocaine
         BackticksRunner.new
       end
     end
+
     @environment = {}
 
     attr_reader :exit_status, :runner
@@ -83,7 +87,12 @@ module Cocaine
         raise Cocaine::CommandNotFoundError
       end
       unless @expected_outcodes.include?($?.exitstatus)
-        raise Cocaine::ExitStatusError, "Command '#{command}' returned #{$?.exitstatus}. Expected #{@expected_outcodes.join(", ")}"
+        message = [
+          "Command '#{full_command}' returned #{$?.exitstatus}. Expected #{@expected_outcodes.join(", ")}",
+          "Here is the command output:\n",
+          output
+        ].join("\n")
+        raise Cocaine::ExitStatusError, message
       end
       output
     end

data/lib/cocaine/command_line/runners.rb

@@ -1,4 +1,6 @@
+# coding: UTF-8
+
 require 'cocaine/command_line/runners/backticks_runner'
 require 'cocaine/command_line/runners/process_runner'
 require 'cocaine/command_line/runners/posix_runner'
-require 'cocaine/command_line/runners/fake_runner'
+require 'cocaine/command_line/runners/fake_runner'

data/lib/cocaine/command_line/runners/backticks_runner.rb

@@ -1,3 +1,7 @@
+# coding: UTF-8
+
+require 'climate_control'
+
 module Cocaine
   class CommandLine
     class BackticksRunner
@@ -10,14 +14,8 @@ module Cocaine
 
       private
 
-      def with_modified_environment(env)
-        begin
-          saved_env = ENV.to_hash
-          ENV.update(env)
-          yield
-        ensure
-          ENV.update(saved_env)
-        end
+      def with_modified_environment(env, &block)
+        ClimateControl.modify(env, &block)
       end
 
     end

data/lib/cocaine/command_line/runners/fake_runner.rb

@@ -1,7 +1,9 @@
+# coding: UTF-8
+
 module Cocaine
   class CommandLine
     class FakeRunner
-      
+
       attr_reader :commands
 
       def initialize
@@ -19,4 +21,4 @@ module Cocaine
 
     end
   end
-end
+end

data/lib/cocaine/command_line/runners/posix_runner.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 module Cocaine
   class CommandLine
     class PosixRunner

data/lib/cocaine/command_line/runners/process_runner.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 module Cocaine
   class CommandLine
     class ProcessRunner

data/lib/cocaine/exceptions.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 module Cocaine
   class CommandLineError     < StandardError; end
   class CommandNotFoundError < CommandLineError; end

data/lib/cocaine/version.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 module Cocaine
-  VERSION = "0.4.2".freeze
+  VERSION = "0.5.0".freeze
 end

data/spec/cocaine/command_line_spec.rb

@@ -12,11 +12,17 @@ describe Cocaine::CommandLine do
   end
 
   it "specifies the $PATH where the command can be found" do
-    Cocaine::CommandLine.path = "/path/to/command/dir"
-    cmd = Cocaine::CommandLine.new("ruby", "-e 'puts ENV[%{PATH}]'")
-    cmd.command.should == "ruby -e 'puts ENV[%{PATH}]'"
-    output = cmd.run
-    output.should match(%r{/path/to/command/dir})
+    saved_path = ENV['PATH']
+    begin
+      ENV['PATH'] = "/the/environment/path:/other/bin"
+      Cocaine::CommandLine.path = "/path/to/command/dir"
+      cmd = Cocaine::CommandLine.new("echo", "$PATH")
+      cmd.command.should == "echo $PATH"
+      output = cmd.run
+      output.should match(%r{/path/to/command/dir:/the/environment/path:/other/bin})
+    ensure
+      ENV['PATH'] = saved_path
+    end
   end
 
   it "specifies more than one path where the command can be found" do
@@ -150,6 +156,21 @@ describe Cocaine::CommandLine do
     end
   end
 
+  it "adds command output to exception message if the result code is nonzero" do
+    cmd = Cocaine::CommandLine.new("convert",
+                                   "a.jpg b.png",
+                                   :swallow_stderr => false)
+    error_output = "Error 315"
+    cmd.stubs(:execute).with("convert a.jpg b.png").returns(error_output)
+    with_exitstatus_returning(1) do
+      begin
+        cmd.run
+      rescue Cocaine::ExitStatusError => e
+        e.message.should =~ /#{error_output}/
+      end
+    end
+  end
+
   it "should keep result code in #exitstatus" do
     cmd = Cocaine::CommandLine.new("convert")
     cmd.stubs(:execute).with("convert").returns(:correct_value)

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'timeout'
 require 'tempfile'
 require 'pry'
 require 'active_support/buffered_logger'
+require 'thread'
 
 Dir[File.dirname(__FILE__) + "/support/**.rb"].each{|support_file| require support_file }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocaine
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,26 +9,32 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: climate_control
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.0.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bourne
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +50,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: bourne
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: posix-spawn
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -177,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A small library for doing (command) lines