gordon 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b043e25a6b4c3ccf9b888fbed5a49bdebdf81e84
-  data.tar.gz: ee2b1c564897fe0ae5873ebec8cd49fdb1ece79d
+  metadata.gz: 41d53eb623de67ea61bd4512fbbf6ee0dabeeb10
+  data.tar.gz: daf61b33e4c44a9669b55b8175df89d6ac28ba0d
 SHA512:
-  metadata.gz: 277914dad0840a1435c46241f80b6ccf44e581ac542f39a0923ac2a3133e7e3f5bd775256eb814d52491fc77e4005c1616a9e9e0e8b7420822e532d67cfc26ca
-  data.tar.gz: 652c41bb215b2f5c650109d8ca8267aa2e295fa86a3b7858e7d2136081c8ccc63b0fed32ae2dc78f541c06cf17ea397e94eff3a70d1c185c6bbb1fe983f91b94
+  metadata.gz: 7a8bec5a44e817b32b6a6a243e92aa4514ebc2ac75f9146e7b21de623d269b5523d126add34286fc23be4b27e5aa255ad742f0916419deae828fae03160e0897
+  data.tar.gz: aec74f74cef7db913b7b850326acfed100495cfa36d994cce87cdc4070add4d01fffe0c3bf3e9da41d9322a1a1b219c7d1d292d3652979a1e2473a436778ba9c

data/README.md

@@ -1,8 +1,8 @@
 # Gordon
 
-We all know that build application packages is a pain. A lot of pain.
+We all know that packaging applications is a pain. A lot of pain.
 
-Of course, [fpm](https://github.com/jordansissel/fpm) is a awesome tool to abstract package building for a lot of Operational Systems. Period.
+Of course, [fpm](https://github.com/jordansissel/fpm) is a awesome tool to abstract package generation for a lot of Operational Systems. Period.
 
 Of course, [fpm-cookery](https://github.com/bernd/fpm-cookery) is another great tool to approach building as a simple recipe.
 
@@ -12,7 +12,7 @@ But, unfortunately, create fpm-cookery recipes for each application can be borin
 
 And when you are in front with a web application that breaks Nginx or Apache conventions? Do you remember that feel, bro?
 
-Gordon is a try to automagically create init files using Foreman and build artifacts using fpm-cookery, on the shoulder of conventions. Make developers free to develop, while you have apps under a minimal control in ops side of view.
+Gordon is a try to automagically create init files using Foreman and export artifacts using fpm-cookery, on the shoulder of conventions. Make developers free to develop, while you have apps under a minimal control in ops side of view.
 
 ## How it works?
 
@@ -51,7 +51,7 @@ Or install it yourself as:
 
 ## Usage
 
-Gordon have two ways to package applications. You can create a yaml file called `gordon.yml` on root of your app. Here an example how to package two apps: ruby web and standalone java.
+Gordon have two ways to package applications. You can create a yaml file called `gordon.yml` on root of your app and CLI will detect it automatically. Here an example how to package two apps: ruby web and standalone java.
 
 ```
 recipes:
@@ -90,7 +90,7 @@ recipes:
 
 ```
 
-For more details about all parameters available, please run `gordon --help` for more details.
+For more details about all parameters available, please run `gordon --help`.
 
 Another way is using CLI directly. Below some examples how to use it.
 

data/lib/gordon/cli.rb

@@ -10,7 +10,7 @@ module Gordon
       parser = create_option_parser(options)
       parser.parse!
 
-      recipes = Cookbook.exists? ? Cookbook.read_and_merge_with(options) : [ Recipe.new(options) ]
+      recipes = Cookbook.exists?(options) ? Cookbook.read_and_merge_with(options) : [ Recipe.new(options) ]
       cooker = Cooker.new(recipes)
       cooker.cook
     end
@@ -75,6 +75,10 @@ module Gordon
           options.output_dir = output_dir
         end
 
+        opts.on('-C', '--recipe RECIPE', 'Gordon YAML Recipe') do |recipe|
+          options.recipe = recipe
+        end
+
         opts.on('-d', '--debug', 'Debug Mode') do |debug|
           options.debug = debug
         end

data/lib/gordon/cookbook.rb

@@ -3,12 +3,15 @@ require 'erb'
 
 module Gordon
   class Cookbook
-    def self.exists?
-      File.exists?(self.get_path)
+    def self.exists?(options)
+      path = self.get_path(options)
+      !path.nil?
     end
 
     def self.read_and_merge_with(main_options)
-      path = self.get_path
+      path = self.get_path(main_options)
+      raise Exceptions::RecipeNotFound.new if path.nil?
+
       body = File.read(path)
       yaml = ERB.new(body)
       data = YAML.load(yaml.result)
@@ -21,8 +24,38 @@ module Gordon
 
     private
 
-    def self.get_path
-      File.join(Dir.pwd, 'gordon.yml')
+    def self.get_path(options)
+      recipe = options.recipe.to_s
+
+      unless recipe.empty?
+        recipe_yaml_path = self.get_recipe_yaml_path(recipe)
+        return recipe_yaml_path if File.exists?(recipe_yaml_path)
+      end
+
+      gordon_yaml_path = self.get_gordon_yaml_path
+      return gordon_yaml_path if File.exists?(gordon_yaml_path)
+
+      nil
+
+#     recipe = options.recipe.to_s
+#     return nil if recipe.empty?
+
+#     recipe_yaml_path = self.get_recipe_yaml_path(recipe)
+#     return recipe_yaml_path if File.exists?(recipe_yaml_path)
+
+#     nil
+    end
+
+    def self.get_gordon_yaml_path
+      self.get_recipe_path('gordon.yml')
+    end
+
+    def self.get_recipe_yaml_path(recipe)
+      self.get_recipe_path(recipe)
+    end
+
+    def self.get_recipe_path(recipe)
+      File.join(Dir.pwd, recipe)
     end
   end
 end

data/lib/gordon/cookery/standalone.rb

@@ -16,4 +16,3 @@ module Gordon
   end
 end
 
-

data/lib/gordon/exceptions.rb

@@ -5,6 +5,12 @@ module Gordon
         super("Operational System not mapped for #{class_name}. OS: #{os_name}")
       end
     end
+
+    class RecipeNotFound < RuntimeError
+      def initialize
+        super("Cannot found gordon.yml or custom gordon recipe yaml.")
+      end
+    end
   end
 end
 

data/lib/gordon/options.rb

@@ -2,6 +2,7 @@ module Gordon
   class Options
     attr_accessor :app_name, :app_description, :app_homepage, :app_version, :app_source, :app_source_excludes, :app_type
     attr_accessor :runtime_name, :runtime_version
+    attr_accessor :recipe
     attr_accessor :http_server_type
     attr_accessor :web_server_type
     attr_accessor :init_type
@@ -28,7 +29,7 @@ module Gordon
         opt.init_type           = main_options.init_type            || recipe['init_type']
 
         opt.package_type        = main_options.package_type         || recipe['package_type']
-        opt.output_dir          = main_options.output_dir           || recipe['output_dir']
+        opt.output_dir          = recipe['output_dir']              || main_options.output_dir
 
         opt.debug               = !main_options.debug.nil? ? main_options.debug : recipe['debug']
         opt.trace               = !main_options.trace.nil? ? main_options.trace : recipe['trace']

data/lib/gordon/version.rb

@@ -1,3 +1,3 @@
 module Gordon
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/gordon/cli_spec.rb

@@ -51,6 +51,7 @@ describe Gordon::CLI do
         [ %w(-S --app-source),          "." ],
         [ %w(-E --app-source-excludes), %(an path) ],
         [ %w(-T --app-type),            "web" ],
+        [ %w(-C --recipe),              "xirubiru.yml" ],
         [ %w(-X --runtime-name),        "ruby" ],
         [ %w(-R --runtime-version),     "2.2.0" ],
         [ %w(-H --http-server-type),    "nginx" ],

data/spec/gordon/cookbook_spec.rb

@@ -1,19 +1,28 @@
 require 'spec_helper'
 
 describe Gordon::Cookbook do
-  let(:path) { File.join(Dir.pwd, 'gordon.yml') }
+  let(:gordon_yaml_path) { File.join(Dir.pwd, 'gordon.yml') }
+  let(:recipe_yaml_path) { File.join(Dir.pwd, 'recipe.yml') }
 
   context 'checking if file exists' do
-    it 'returns true when exists' do
-      expect(File).to receive(:exists?).with(path).and_return(true)
+    let(:options) { instance_double(Gordon::Options) }
 
-      expect(described_class.exists?).to be_truthy
+    it 'returns true when recipe yaml exists' do
+      expect(options).to receive(:recipe).and_return('recipe.yml')
+
+      expect(File).to     receive(:exists?).with(recipe_yaml_path).and_return(true)
+      expect(File).to_not receive(:exists?).with(gordon_yaml_path)
+
+      expect(described_class.exists?(options)).to be_truthy
     end
 
-    it 'returns false otherwise' do
-      expect(File).to receive(:exists?).with(path).and_return(false)
+    it 'returns true when gordon yaml exists' do
+      expect(options).to receive(:recipe).and_return(nil)
+
+      expect(File).to     receive(:exists?).with(gordon_yaml_path).and_return(true)
+      expect(File).to_not receive(:exists?).with(recipe_yaml_path)
 
-      expect(described_class.exists?).to be_falsey
+      expect(described_class.exists?(options)).to be_truthy
     end
   end
 
@@ -37,12 +46,37 @@ describe Gordon::Cookbook do
     let(:recipe)        { instance_double(Gordon::Recipe) }
     let(:recipes)       { [ recipe ] }
 
+    it 'renders recipe yaml file and returns a list of recipes' do
+      expect(main_options).to receive(:recipe).and_return('recipe.yml')
+
+      expect(File).to     receive(:exists?).with(recipe_yaml_path).and_return(true)
+      expect(File).to_not receive(:exists?).with(gordon_yaml_path)
+
+      expect(File).to receive(:read).with(recipe_yaml_path).and_return(content)
+
+      erb = instance_double(ERB)
+      expect(erb).to  receive(:result).and_return(result)
+      expect(ERB).to  receive(:new).with(content).and_return(erb)
+      expect(YAML).to receive(:load).with(result).and_return(yaml)
+
+      option = instance_double(Gordon::Options)
+      expect(Gordon::Options).to receive(:from).with(main_options, yaml['recipes'].first).and_return(option)
+      expect(Gordon::Recipe).to receive(:new).with(option).and_return(recipe)
+
+      expect(described_class.read_and_merge_with(main_options)).to eq(recipes)
+    end
+
     it 'renders gordon yaml file and returns a list of recipes' do
-      expect(File).to receive(:read).with(path).and_return(content)
+      expect(main_options).to receive(:recipe).and_return(nil)
+
+      expect(File).to_not receive(:exists?).with(recipe_yaml_path)
+      expect(File).to     receive(:exists?).with(gordon_yaml_path).and_return(true)
+
+      expect(File).to     receive(:read).with(gordon_yaml_path).and_return(content)
 
       erb = instance_double(ERB)
-      expect(erb).to receive(:result).and_return(result)
-      expect(ERB).to receive(:new).with(content).and_return(erb)
+      expect(erb).to  receive(:result).and_return(result)
+      expect(ERB).to  receive(:new).with(content).and_return(erb)
       expect(YAML).to receive(:load).with(result).and_return(yaml)
 
       option = instance_double(Gordon::Options)
@@ -51,6 +85,14 @@ describe Gordon::Cookbook do
 
       expect(described_class.read_and_merge_with(main_options)).to eq(recipes)
     end
+
+    it 'raises error when no recipe is found' do
+      expect(main_options).to receive(:recipe).and_return(nil)
+
+      expect(File).to receive(:exists?).with(gordon_yaml_path).and_return(false)
+
+      expect{ described_class.read_and_merge_with(main_options) }.to raise_error(Gordon::Exceptions::RecipeNotFound)
+    end
   end
 end
 

data/spec/gordon/options_spec.rb

@@ -62,6 +62,12 @@ describe Gordon::Options do
       expect(instance.app_source).to eq(recipe['app_source'])
     end
 
+    it 'priorizes output dir from recipe instead of main option' do
+      instance = described_class.from(main_options, recipe)
+
+      expect(instance.output_dir).to eq(recipe['output_dir'])
+    end
+
     it 'merges app source excludes values from main options and recipes' do
       instance = described_class.from(main_options, recipe)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gordon
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Marcelo Pinheiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A tool to create application OS packages