Thin_Upstreams 0.2.0 → 0.3.0

data/README.md

@@ -64,27 +64,33 @@ Note: Output File
 Usage: In Ruby
 ------
 
-Accepts optional file glob:
-
     require "Thin_Upstreams"
     
     Dir.chdir("/my_apps") {
+    
       Thin_Upstreams()
+      # or...
       Thin_Upstreams "*/configs/my.thin.yml"
+      
+      # File /my_apps/upstreams.conf is 
+      #   created/overwritten.
     }
     
-File /my\_apps/upstreams.conf is created/overwritten.
+The file glob follows the same format use by [Dir.glob](http://ruby-doc.org/core-1.9.3/Dir.html#method-c-glob).
+
+**Remember**: Use `Thin_Upstreams()`, not `Thin_Upstreams`, when using no arguments.
 
 Usage: Bash/Shell
 ------
 
-File glob argument is optional:
-
     cd /my_apps
     Thin_Upstreams
-    Thin_Upstreams "*/configs/my.thin.yml"
+    Thin_Upstreams "*/configs/thin.yml"
+
+**Remember**: Use single quotation marks when using a Ruby-style glob in your shell to 
+prevent your shell from expanding the glob:
 
-File /my\_app/upstreams.conf is created/overwritten.
+    Thin_Upstreams '*/{configs,.}/thin.yml'
 
 Run Tests
 ---------

data/Thin_Upstreams.gemspec

@@ -5,7 +5,7 @@ require "Thin_Upstreams/version"
 
 Gem::Specification.new do |s|
   s.name        = "Thin_Upstreams"
-  s.version     = Thin_Upstreams::VERSION
+  s.version     = Thin_Upstreams_Version
   s.authors     = ["da99"]
   s.email       = ["i-hate-spam-45671204@mailinator.com"]
   s.homepage    = "https://github.com/da99/Thin_Upstreams"

data/lib/Thin_Upstreams.rb

@@ -1,7 +1,7 @@
 require 'Thin_Upstreams/version'
 require "yaml"
 
-def Thin_Upstreams glob = "./*/config/thin.yml"
+def Thin_Upstreams glob = "./*/{config,.}/thin.yml"
 
   str = %~\n~
   arr = Dir.glob(glob).sort.each { |file|
@@ -12,7 +12,7 @@ def Thin_Upstreams glob = "./*/config/thin.yml"
                    path.sub(pwd, '').split("/").first
                  end
       
-      ports = Thin_Upstreams.port_to_array(o["port"], o["servers"])
+      ports = Thin_Port_To_Array(o["port"], o["servers"])
       str << %~
         upstream #{app_name} {
           #{ ports.map { |i| "server 127.0.0.1:#{i}" }.join(";
@@ -24,18 +24,8 @@ def Thin_Upstreams glob = "./*/config/thin.yml"
   File.write "upstreams.conf", str
 end
 
-class Thin_Upstreams
-  
-  module Class_Methods
-
-    def port_to_array raw_port, raw_num
-      port = Integer(raw_port)
-      q    = Integer(raw_num || 1)
-      (0...q).to_a.map { |i| port + i }
-    end
-
-  end # === module Class_Methods
-  
-  extend Class_Methods
-  
-end # === class Thin_Upstreams
+def Thin_Port_To_Array raw_port, raw_num
+  port = Integer(raw_port)
+  q    = Integer(raw_num || 1)
+  (0...q).to_a.map { |i| port + i }
+end

data/lib/Thin_Upstreams/version.rb

@@ -1,3 +1 @@
-class Thin_Upstreams
-  VERSION = "0.2.0"
-end
+Thin_Upstreams_Version = "0.3.0"

data/spec/tests/create.rb

@@ -76,5 +76,14 @@ describe "Thin_Upstreams" do
     }
   end
 
+  it "uses a default glob of: */{config,.}/thin.yml" do
+    chdir {
+      Thin_Upstreams()
+      %w{ 3010 6010 7020 }.each { |port|
+        File.read('upstreams.conf')[":7020"].should == ":7020"
+      }
+    }
+  end
+
 end # === Thin_Upstreams
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Thin_Upstreams
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors: