union_station_hooks_core 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmJiODdmYzU4ZGE4NDZmZjYyMDRiNGI4NmE4ZjE1Njk0MzE0OGVhNw==
+    ZGU3MGNhZGUwZjEzYzZkMzM1OTk1ZmExZTg0MjQ3MzlmZTNjZDdkZQ==
   data.tar.gz: !binary |-
-    YzA4NDM4NGQzMWM5MWU0NzE4OTIyNDQ1MGMyMGNmZDFkYjQ4YjM1Mg==
+    ZjY4NzI5MTJjZDIxOWJhZTQ2OWZiNTk2ZWYzYWUyODEyYzlkYTNhZQ==
 SHA512:
   metadata.gz: !binary |-
-    YzZkYjIwYjI0MmJmYjRiMjU5Zjc4OTFlOTVmNWUwMzhiMzVhZDJkZjhmNGQ1
-    NGExMDI2ZDVjYmEwMDM1NDY0N2I5MDM0YjQ2YWUwNWFmNDk0ZmZlMjA3NmE1
-    MzZkNGYyMTUyYmU1NjI3YTA0YzVhNDIzZTI3NDYyOWIxYzg3MGU=
+    ODk1YzBlZTM4ZmI4MjllMGZjODkxZTkzY2NkOTI2MTJhZjc5YjM4YjUxYjcy
+    MmVlZTI0MDBmZGZjOGFjNzgzN2NhMjRmNWZkMWI4NWNhZmY4YjhlNWRhZjcy
+    N2JlZDYzNGE2NGFhN2YwOTQ4NmJhZDc2ZWVlODcyODRlNWExMzI=
   data.tar.gz: !binary |-
-    MTkyNzY1OWYwYjJlNDA5Y2NjZWE1ZGM3YWU1YzVlMzU1MGQwODZjNGJkODhm
-    NWZhMGE2NmJkOGU0YjJjMzE0Mzk5MjJiZTQ1ZTJlZjYzNmQ4ZDQ0M2Y4ODI5
-    ZGUwYWUyNDVjMzliNDViMDcwNTZmMTQ1Mzc1YWE0MGMzMTg5N2Y=
+    ODQ1MDQ4MGRjNjhjMjBjMWUxMzliMTA5ODZjNDM5ODIxMzA0N2JmYTcxOTc0
+    ZjFmODdjMjcyYjZjZjQ5NzNiYWQ5YjMyNTc2OTg4Y2UzOGZhOGQ1NjgyMjRh
+    YTNhMGI1OTFmOGM0NDFhNTQ5YTc1ZDM4NjE3ZTg4YjVmZGI0MmY=

data/lib/union_station_hooks_core/context.rb

@@ -235,9 +235,9 @@ module UnionStationHooks
   private
 
     RANDOM_CHARS = %w(
-      abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ
-      0123456789
+      a b c d e f g h i j k l m n o p q r s t u v w x y z
+      A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
+      0 1 2 3 4 5 6 7 8 9
     )
 
     def connect

data/lib/union_station_hooks_core/spec_helper.rb

@@ -56,12 +56,8 @@ module UnionStationHooks
     def find_passenger_config
       passenger_config = ENV['PASSENGER_CONFIG']
       if passenger_config.nil? || passenger_config.empty?
-        ENV['PATH'].split(':').each do |path|
-          if File.exist?("#{path}/passenger-config")
-            passenger_config = "#{path}/passenger-config"
-            break
-          end
-        end
+        passenger_config = find_passenger_config_vendor ||
+          find_passenger_config_in_path
       end
       if passenger_config.nil? || passenger_config.empty?
         abort 'ERROR: The unit tests are to be run against a specific ' \
@@ -73,6 +69,28 @@ module UnionStationHooks
       passenger_config
     end
 
+    # Looks for the passenger-config command in PATH, returning nil
+    # if not found.
+    def find_passenger_config_in_path
+      ENV['PATH'].split(':').each do |path|
+        if File.exist?("#{path}/passenger-config")
+          return "#{path}/passenger-config"
+        end
+      end
+    end
+
+    # Checks whether this union_station_hooks installation is a copy that
+    # is vendored into Passenger, and if so, returns the full path to the
+    # containing Passenger's passenger-config command.
+    def find_passenger_config_vendor
+      path = "#{UnionStationHooks::ROOT}/../../../../../bin/passenger-config"
+      if File.exist?(path)
+        File.expand_path(path)
+      else
+        nil
+      end
+    end
+
     # Uses `find_passenger_config` to lookup a Passenger installation, and
     # loads the Passenger Ruby support library associated with that
     # installation. All the constants defined in the Passenger Ruby support

data/lib/union_station_hooks_core/version_data.rb

@@ -39,6 +39,6 @@
 {
   :major  => 1,
   :minor  => 0,
-  :tiny   => 1,
-  :string => '1.0.1'
+  :tiny   => 2,
+  :string => '1.0.2'
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: union_station_hooks_core
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Hongli Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies: []
 description: Union Station Ruby hooks core code.
 email: info@phusion.nl