Thin_Upstart 1.0.0 → 1.1.0

data/README.md

@@ -39,6 +39,7 @@ Usage: Ruby
       o.templates "./templates/*.conf" # file glob     
       o.output    "./upstart"        
       o.yml       "config/thin.yml"  
+      o.kv        Hash[]               # Custom key/value for your mustache templates.
     }
 
 If you want to delete files generated by Thin\_Upstart, use:
@@ -70,18 +71,18 @@ Usage: Mustache Template
 -----
 In your Mustache templates, you have access to the following values:
 
-* *name:*       Name of app group: e.g. My-Web-Apps
-* *apps\_dir:*  Full path to directory of apps.
-* *app:*        Name of current app: e.g. Blog
-* *app\_path:*  Full path to app.
-* *yml:*        Relative path from current app directory to .yml file
-* *yml\_path:*  Full path to app directory.
+* **name:**       Name of app group: e.g. My-Web-Apps
+* **app:**        Name of current app: e.g. Blog
+* **yml:**        Relative path from current app directory to .yml file
+* **app\_path:**  Full path to app.
+* **yml\_path:**  Full path to .yml file.
+* **apps\_dir:**  Full path to directory of apps.
 
 You can use Mustache values in the file names of the templates. 
 For example:
 
-* my/template/dir/*{{name}}*.conf         
-* my/template/dir/*{{name}}*-*{{app}}*.conf
+* my/template/dir/**{{name}}**.conf         
+* my/template/dir/**{{name}}**-**{{app}}**.conf
 
 The files are generated are:
 

data/bin/Thin_Upstart

@@ -12,6 +12,7 @@ h = Hash[
   :apps =>  "Path to dir containing apps.",
   :templates =>  "File glob for templates: e.g. \"./templates/*.conf\"", 
   :output =>  "Output directory.",
+  :kv     =>  %@ Additional values for Mustache: e.g. --kv " k1 => v1 , k2 => v2 " @,
   :trash  =>  "Dir to trash. All other arguments are ignored."
 ]
 
@@ -21,18 +22,37 @@ opts = Trollop::options do
   }
 end
 
+def string_to_hash orig
+  temp = orig.split(',').map { |pair| pair.split("=>") }
+  unless temp.map { |pair| pair.size }.uniq == [2]
+    raise ArgumentError, "Invalid format for hash: #{orig}"
+  end
+
+  temp.inject(Hash[]) { |memo, pair| 
+    memo[pair.first.strip] = pair.last.strip
+    memo 
+  }
+end # ==== string_to_hash
+
 if opts[:trash_given]
+  
   files = Thin_Upstart.trash opts[:trash]
   files.each { |f|
     puts "deleted: #{f}"
   }
+  
 else
+  
   files = Thin_Upstart { |o|
     h.each { |k, desc|
-      o.send(k, opts[k]) if opts[k]
+      next unless opts[:"#{k}_given"]
+
+      (opts[k] = string_to_hash(opts[k])) if [ :kv, 'kv' ].include?(k)
+      o.send(k, opts[k])
     }
   }
-   files.each { |f|
-     puts "created: #{f}"
-   }
+  
+  files.each { |f|
+    puts "created: #{f}"
+  }
 end

data/lib/Thin_Upstart.rb

@@ -2,6 +2,8 @@ require 'Thin_Upstart/version'
 require 'Exit_Zero'
 require 'mustache'
 
+Mustache.raise_on_context_miss = true
+
 def Thin_Upstart
   o = Thin_Upstart.new
   yield o
@@ -34,6 +36,7 @@ class Thin_Upstart
     templates "./templates/*.conf"
     output    "./upstart"
     yml       "thin.yml"
+    kv        Hash[]
     yield(self) if block_given?
   end
 
@@ -63,7 +66,7 @@ class Thin_Upstart
       app_list << app
     
       yml = yml_path.sub( File.join(app_path, '/'), '')
-      
+
       vals = remove_last_slash Hash[ 
         :name => name, 
         :app  => app, 
@@ -71,7 +74,7 @@ class Thin_Upstart
         :yml  => yml,
         :yml_path => yml_path,
         :apps_dir => File.expand_path(apps)
-      ]
+      ].merge(kv || {} )
       
       tmpls.each { |file|
         temp_path = Mustache.render(file, vals)
@@ -99,7 +102,7 @@ class Thin_Upstart
     end
   end
 
-  %w{ name yml }.each { |attr|
+  %w{ name yml kv }.each { |attr|
   
     eval %~
       def #{attr} *args

data/lib/Thin_Upstart/version.rb

@@ -1,3 +1,3 @@
 class Thin_Upstart
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/templates/custom/custom.conf

@@ -0,0 +1,4 @@
+
+
+custom_1: {{custom_1}}
+custom_2: {{custom_2}}

data/spec/templates/missing/missing.conf

@@ -0,0 +1,4 @@
+
+
+custom_1: {{custom_123}}
+custom_2: {{custom_456}}

data/spec/tests/bin.rb

@@ -58,6 +58,13 @@ describe "bin: Thin_Upstart" do
       should_mustache "name", "My-Apps", "new-upstart/My-Apps-Hi.conf"
     }
   end
+
+  it "accepts --kv" do
+    chdir {
+      bin %@ --templates templates/custom/*.conf --kv " custom_1 => 1 , custom_2 => c2"@
+      should_mustache "custom_2", "c2", "upstart/custom.conf"
+    }
+  end
   
 end # === bin: Thin_Upstart
 

data/spec/tests/mustache.rb

@@ -27,6 +27,30 @@ describe "Thin_Upstart Mustache values" do
     chdir { should_mustache 'apps_dir', File.expand_path("./apps") }
   end
   
+  it "sets custom values" do
+    chdir { 
+      Thin_Upstart { |o|
+        o.name 'my-apps'
+        o.templates 'templates/custom/*.conf'
+        o.kv   :custom_1=>"1", :custom_2=>"2"
+      }
+      should_mustache 'custom_1', '1', "upstart/custom.conf"
+      should_mustache 'custom_2', '2', "upstart/custom.conf"
+    }
+  end
+
+  it "raises error if Mustache templates uses unknown value" do
+    chdir { 
+      lambda do
+        Thin_Upstart { |o|
+          o.name 'my-apps'
+          o.templates 'templates/missing/*.conf'
+        }
+      end.should.raise(Mustache::ContextMiss)
+      .message.should.match %r!Can't find custom_123 in !
+    }
+  end
+
 end # === Thin_Upstart Mustache values
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Thin_Upstart
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -144,6 +144,8 @@ files:
 - lib/templates/{{name}}.conf
 - spec/helper.rb
 - spec/main.rb
+- spec/templates/custom/custom.conf
+- spec/templates/missing/missing.conf
 - spec/templates/{{name}}-{{app}}.conf
 - spec/templates/{{name}}.conf
 - spec/tests/bin.rb