procodile 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7feabe360a0d490ac91076744fd7f782d39eebd0
-  data.tar.gz: 71e2007d58331378e50d47263f12dee80b35d103
+  metadata.gz: 52606401641f665e09ce9beae6a752e70e3a680a
+  data.tar.gz: 052b223485baa0c66d5f67a3ff52afb9ed5a4ed4
 SHA512:
-  metadata.gz: ee34c71d613246a255baaa0c9d2a6bf43be1ed845bd0001413c3e1cf45bc4b43eb7fb39563c79483ced396a277158a11f65348e82791340db699cf4f7e847089
-  data.tar.gz: d6f501fbb6997231185507fcddd508446399a75b74eb53fa519f922c54d5eaecfb7e1c12f909407b056d1122b80baa9e3dfb1f2d279abffd3093e19667632f16
+  metadata.gz: 9c97e8abbcade5ed3e51553ff97a0b658f69a326e4afc84029070e288b5882ea8b4b2d5c6e22bcfae15afd31c2305ac30a353a5c20e39849be41ddeafbf40fbb
+  data.tar.gz: eae3e1a71001a027ab132e5797a59c1b78e383bd6aac1f68dfe8ccba7b33afe81db7efc5ed8bf09212a7606d82fade99da6afb54f5e062eb480d75aad9cb8762

data/bin/procodile

@@ -62,7 +62,7 @@ if ap.ambiguous?
   if ENV['PROCODILE_APP_ID']
     ap.set_app(ENV['PROCODILE_APP_ID'].to_i)
   elsif ap.app_options.empty?
-    $stderr.puts "Error: Could not find procodile in #{FileUtils.pwd}/Procfile".color(31)
+    $stderr.puts "Error: Could not find Procfile in #{FileUtils.pwd}/Procfile".color(31)
     exit 1
   else
     puts "There are multiple applications configured in #{global_config_path}"

data/lib/procodile/app_determination.rb

@@ -91,17 +91,17 @@ module Procodile
     def find_root_and_procfile(pwd, root, procfile)
       if root && procfile
         # The user has provided both the root and procfile, we can use these
-        @root = File.expand_path(root)
-        @procfile = File.expand_path(procfile, @root)
+        @root = expand_path(root)
+        @procfile = expand_path(procfile, @root)
       elsif root && procfile.nil?
         # The user has given us a root, we can assume they want to use the procfile
         # from the root
-        @root = File.expand_path(root)
+        @root = expand_path(root)
         @procfile = File.join(@root, 'Procfile')
       elsif root.nil? && procfile
         # The user has given us a procfile but no root. We will assume the procfile
         # is in the root of the directory
-        @procfile = File.expand_path(procfile)
+        @procfile = expand_path(procfile)
         @root = File.dirname(@procfile)
       else
         # The user has given us nothing. We will check to see if there's a Procfile
@@ -130,10 +130,10 @@ module Procodile
     end
 
     def global_options_for_path(root)
-      root = File.expand_path(root)
-      if @global_options.is_a?(Hash) && @global_options['root'] && File.expand_path(@global_options['root']) == root
+      root = expand_path(root)
+      if @global_options.is_a?(Hash) && @global_options['root'] && expand_path(@global_options['root']) == root
         @global_options
-      elsif @global_options.is_a?(Array) && option = @global_options.select { |o| o['root'] && File.expand_path(o['root']) == root }.first
+      elsif @global_options.is_a?(Array) && option = @global_options.select { |o| o['root'] && expand_path(o['root']) == root }.first
         option
       else
         nil
@@ -146,5 +146,18 @@ module Procodile
       @environment = options['environment'] if options['environment']
     end
 
+    def expand_path(path, root = nil)
+      # Remove trailing slashes for normalization
+      path = path.gsub(/\/\z/, '')
+      if path =~ /\//
+        # If the path starts with a /, it's absolute. Do nothing.
+        path
+      else
+        # Otherwise, if there's a root provided, it should be from the root
+        # of that otherwise from the root of the current directory.
+        root ? File.join(root, path) : File.join(@pwd, path)
+      end
+    end
+
   end
 end

data/lib/procodile/cli.rb

@@ -359,7 +359,15 @@ module Procodile
     desc "Run a command within the environment"
     command def run
       desired_command = ARGV.drop(1).join(' ')
-      exec(@config.environment_variables, desired_command)
+      if desired_command.length == 0
+        raise Error, "You need to specify a command to run (e.g. procodile run -- rake db:migrate)"
+      else
+        begin
+          exec(@config.environment_variables, desired_command)
+        rescue Errno::ENOENT => e
+          raise Error, e.message
+        end
+      end
     end
 
     #
@@ -369,7 +377,11 @@ module Procodile
     command def console
       if cmd = @config.console_command
         environment = @config.environment_variables
-        exec(environment, cmd)
+        begin
+          exec(environment, cmd)
+        rescue Errno::ENOENT => e
+          raise Error, e.message
+        end
       else
         raise Error, "No console command has been configured in the Procfile"
       end

data/lib/procodile/version.rb

@@ -1,3 +1,3 @@
 module Procodile
-  VERSION = '1.0.13'
+  VERSION = '1.0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procodile
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -76,4 +76,3 @@ specification_version: 4
 summary: This gem will help you run Ruby processes from a Procfile on Linux servers
   in the background.
 test_files: []
-has_rdoc: