Thin_Upstreams 0.1.2 → 0.1.3

data/README.md

@@ -2,45 +2,89 @@
 Thin\_Upstreams
 ================
 
-A Ruby gem to generate .conf files with upstreams
+A Ruby gem to generate partial .conf files with upstreams
 to include in your nginx.conf. It uses your Thin
-configuration files.
+.yml configuration files.
+
+Assuming you have a directory structure of:
+
+    /cwd (current working directory)
+      |-- Hi/config/thin.yml    (port 6010, servers 3)
+      |-- Hello/config/thin.yml (port 7000, servers 2)
+
+The file would be generated as `/cwd/upstreams.conf`:
+     
+    upstream Hi {
+      server 127.0.0.1:6010;
+      server 127.0.0.1:6011;
+      server 127.0.0.1:6012;
+    }
+
+    upstream Hello {
+      server 127.0.0.1:7000;
+      server 127.0.0.1:7001;
+    }
+
+Then, in your nginx.conf:
+
+    # ... your other settings
+    
+    http {
+    
+       # ... your other settings
+
+       include /cwd/upstreams.conf;
+
+       server {
+      
+         location / {
+           proxy_pass http://Hi;
+         }
+        
+         location /sub {
+           proxy_pass http://Hello;
+         }
+       }
+    }
+
 
 Installation
 ------------
 
-    gem 'Thin_Upstreams'
+    gem install Thin_Upstreams
+
+Note: Output File
+----
+
+* Output file name: `upstreams.conf`
+* You can't specify file output name.
+* File is overwritten. No safety checks or warnings.
 
-Notes
------
- 
-File upstreams.conf is created in current working directory.
-You can't specify file output name.
 
 Usage: In Ruby
 ------
 
-Accepts optional file globs:
+Accepts optional file glob:
 
     require "Thin_Upstreams"
     
-    Dir.chdir("/apps") {
+    Dir.chdir("/my_apps") {
       Thin_Upstreams()
-      Thin_Upstreams "*/configs/my.thin.yml", "./**/config.yml"
+      Thin_Upstreams "*/configs/my.thin.yml"
     }
     
-File /app/upstreams.conf is created/overwritten. You
+File /my\_apps/upstreams.conf is created/overwritten.
 
 Usage: Bash/Shell
 ------
 
-File glob arguments are optional:
+File glob argument is optional:
 
-    cd /apps
+    cd /my_apps
     Thin_Upstreams
-    Thin_Upstreams "*/configs/my.thin.yml", "./**/config.yml"
+    Thin_Upstreams "*/configs/my.thin.yml"
 
-File /app/upstreams.conf is created/overwritten.
+File /my\_app/upstreams.conf is created/overwritten.
 
 Run Tests
 ---------

data/Thin_Upstreams.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'Exit_Zero'
+  s.add_development_dependency 'Exit_0'
   s.add_development_dependency 'bacon'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'Bacon_Colored'

data/lib/Thin_Upstreams/version.rb

@@ -1,3 +1,3 @@
 class Thin_Upstreams
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/Thin_Upstreams.rb

@@ -4,7 +4,7 @@ require "yaml"
 def Thin_Upstreams glob = "./*/config/thin.yml"
 
   str = %~\n~
-  arr = Dir.glob(glob).each { |file|
+  arr = Dir.glob(glob).sort.each { |file|
       o = YAML::load File.read(file)
       app_name = begin
                    pwd  = File.join( File.expand_path("."), "/" )

data/spec/main.rb

@@ -3,40 +3,42 @@ require File.expand_path('spec/helper')
 require 'Thin_Upstreams'
 require 'Bacon_Colored'
 require 'pry'
-require 'Exit_Zero'
+require 'Exit_0'
 
 DIR = "/tmp/Thin_Upstreams"
 
+def chdir
+  Dir.chdir(DIR) {
+    yield
+  }
+end
+
 def reset_dir
-  Exit_Zero "rm -rf #{DIR}"
+  Exit_0 "rm -rf #{DIR}"
   
-  Exit_Zero "mkdir -p #{DIR}/Hi/config"
-  Exit_Zero "mkdir -p #{DIR}/Hi/custom"
+  Exit_0 "mkdir -p #{DIR}/Hi/config"
+  Exit_0 "mkdir -p #{DIR}/Hi/custom"
   
-  Exit_Zero "mkdir -p #{DIR}/Hello/config"
-  Exit_Zero "mkdir -p #{DIR}/Hello/custom"
+  Exit_0 "mkdir -p #{DIR}/Hello/config"
+  Exit_0 "mkdir -p #{DIR}/Hello/custom"
   
   chdir {
-    Exit_Zero "cd Hi/config    && bundle exec thin config -C thin.yml --port 3010 --servers 2"
-    Exit_Zero "cd Hello/config && bundle exec thin config -C thin.yml --port 4010 --servers 3"
+    Exit_0 "cd Hi/config    && bundle exec thin config -C thin.yml --port 3010 --servers 2"
+    Exit_0 "cd Hello/config && bundle exec thin config -C thin.yml --port 4010 --servers 3"
     
-    Exit_Zero "cd Hi/custom    && bundle exec thin config -C my.yml --port 6010 --servers 4"
-    Exit_Zero "cd Hello/custom && bundle exec thin config -C my.yml --port 7010 --servers 5"
+    Exit_0 "cd Hi/custom    && bundle exec thin config -C my.yml --port 6010 --servers 4"
+    Exit_0 "cd Hello/custom && bundle exec thin config -C my.yml --port 7010 --servers 5"
   }
 end
 
+reset_dir 
+
 def reset_file
   chdir { 
     file = "upstreams.conf"
     nginx = "nginx.conf"
-    Exit_Zero "rm #{file}" if File.exists?(file)
-    Exit_Zero "rm #{nginx}" if File.exists?(nginx)
-  }
-end
-
-def chdir
-  Dir.chdir(DIR) {
-    yield
+    Exit_0 "rm #{file}" if File.exists?(file)
+    Exit_0 "rm #{nginx}" if File.exists?(nginx)
   }
 end
 

data/spec/tests/bin.rb

@@ -17,7 +17,7 @@ describe "Thin_Upstreams (bin executable)" do
   it "creates upstreams.conf file" do
     target = "upstream Hi"
     chdir {
-      Exit_Zero "Thin_Upstreams"
+      Exit_0 "Thin_Upstreams"
       File.read("upstreams.conf")[target].should == target
     }
   end
@@ -25,7 +25,7 @@ describe "Thin_Upstreams (bin executable)" do
   it "accepts a file glob" do
     target = ":601"
     chdir {
-      Exit_Zero "Thin_Upstreams \"*/custom/*.yml\""
+      Exit_0 "Thin_Upstreams \"*/custom/*.yml\""
       File.read("upstreams.conf")[target].should == target
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Thin_Upstreams
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: Exit_Zero
+  name: Exit_0
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Create upstreams conf file for Nginx.