gordon 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c54664a1e5359e5fd1fcbba7441631a573126523
-  data.tar.gz: f7891f315e9960dc15cec108bea040aa6158327f
+  metadata.gz: 8807e453ec5c7d49cef487a753959d7a88e53a46
+  data.tar.gz: 3ed6815c1615d8c5a39ee20c862dd509c8b63056
 SHA512:
-  metadata.gz: 99b6cff85548e38b072b5d28750bb8da757117fdbb0c1ab03d60ae07fd12c89399f51d38c99f42b1a91f45469b4750b4de39acc23bbfa82d22ffa602fb9cee12
-  data.tar.gz: f97b983cf4239584ed6e007cba368f865792b18da71f944c7bc8f4f38650c43633c85134c2da5f8a149c28e92f199345e57ff974322f8b7d33d38573b4fef5b6
+  metadata.gz: 2d25d8c05b10dd34c1e7ef11cc7adf9695897f6930efebe2afbee1949e0a636a5fe636c84713e0a7fae07c58ff0ab06052f11a1e92c823fd43c6e6c0eb29c25a
+  data.tar.gz: 9c5fd2889928bb9a481d785c7900e4739021c4bfbc52a07f13820add8bae277f722d9ba4c6a343fb88c4d64d91d247a77fa3a1619b6b7fb29c55b62066b16bc9

data/README.md

@@ -6,20 +6,25 @@ Of course, [fpm](https://github.com/jordansissel/fpm) is a awesome tool to abstr
 
 Of course, [fpm-cookery](https://github.com/bernd/fpm-cookery) is another great tool to approach building as a simple recipe.
 
-But, unfortunately, create recipes for each application can be boring and repetitive. You need to create init files (inittab, systemd, etc) for each project
-and, if a webserver changes (example: from Thin to Unicorn) you need to change script again, again and again.
+Of course, [foreman](https://github.com/ddollar/foreman) is a great tool to handle Procfile-based applications and have the amazing feature of export to init files (systemd, runit, inittab).
+
+But, unfortunately, create fpm-cookery recipes for each application can be boring and repetitious. You need to create init files (inittab, systemd, etc) for each project and, if a webserver changes (example: from Thin to Unicorn) you need to change script again, again and again.
 
 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. Make developers free to develop, while you take apps under a minimal control.
+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.
 
 ## How it works?
 
-Gordon have a lot of restrictions:
+Gordon have a lot of restrictions, because they are liberating. These restrictions are a result of years packaging apps, since code generation to minimal security & ops conventions.
+
+Per example: create a user that will run app with credentials, whose $HOME is the directory of application, is a good practice. Therefore, any web app will follow this rule with Gordon. Period.
+
+## How are the options?
 
 * Web Servers: Nginx or Apache (Tomcat soon);
-* Init scripts: all generated by Foreman;
-* Apps supported: at this time, Ruby. Java soon and others too.
+* Init scripts: Systemd (all generated by Foreman soon);
+* Apps supported: at this time, Ruby Web App. Java soon and others when needed.
 
 ## Installation
 
@@ -39,30 +44,33 @@ Or install it yourself as:
 
 A simple example to build a Ruby Web App that runs Nginx and uses Systemd as init process:
 
-    $ ruby -S gordon                    \
-      --app-type        ruby_web_app    \
-      --app-name        $APP_NAME       \
-      --app-desc        $APP_DESC       \
-      --app-repo        $APP_REPO       \
-      --app-version     $APP_VERSION    \
-      --package-type    rpm             \
-      --package-dir     .               \
-      --source-dir      .               \
-      --build-dir       /tmp            \
-      --skeleton-type   nginx           \
-      --init-type       systemd         \
-      --init-build-dir  /tmp/systemd
-
-It will generate a RPM package with the following structure:
+    $ ruby -S gordon                     \
+      --app-name         $APP_NAME       \
+      --app-desc         $APP_DESC       \
+      --app-repo         $APP_REPO       \
+      --app-version      $APP_VERSION    \
+      --app-source-dir   .               \
+      --app-type         ruby_web_app    \
+      --http-server-type nginx           \
+      --init-type        systemd         \
+      --package-type     rpm             \
+      --output           pkg
+
+It will generate a RPM package in pkg/ with the following structure:
 
 * /usr/share/nginx/html/*all-app-stuff*
 * /usr/lib/systemd/system/*app-name*/*all-systemd-stuff*
 
+Due for conventions, remember:
+
+* /usr/share/nginx/html is $HOME of user *app-name*
+* Systemd will run app using user *app-name*
+
 Sounds good?
 
 ## Why you not use Omnibus or Heroku buildpacks?
 
-Because I want to create a tool that can be used as a transition step.
+Because I want to create a tool that can be used as a transition step for building apps.
 
 ## Why you use fpm-cookery templates instead of fpm?
 
@@ -76,10 +84,8 @@ Because I like Gordon Ramsay.
 
 * Very unstable, need to fix it
 * Validate outputs
-* Fix annoying --package-dir OptionParser::InvalidOption error
 * Add a way to map package dependencies
 * Adapt to use Debian and other OS conventions for Nginx and Apache
-* Create a better way to handle env vars than injecting a lot of global variables in fpm-cookery ruby-web-app template
 * Tests
 
 ## Contributing

data/gordon.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Gordon::VERSION
   spec.authors       = ["Marcelo Pinheiro"]
   spec.email         = ["salizzar@gmail.com"]
-  spec.description   = %q{Gordon is a tool to create artifacts using fpm-cookery and foreman.}
-  spec.summary       = %q{A tool to create application artifacts}
+  spec.description   = %q{Gordon is a tool to create OS packages using fpm-cookery and foreman, based on a lot of conventions.}
+  spec.summary       = %q{A tool to create application OS packages}
   spec.homepage      = "https://github.com/salizzar/gordon"
   spec.license       = "MIT"
 
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "debugger"
 
   spec.add_dependency "fpm-cookery"
   spec.add_dependency "foreman"

data/lib/gordon/application/factory.rb

@@ -0,0 +1,12 @@
+module Gordon
+  module Application
+    class Factory
+      def self.create(application_type)
+        namespace = "Application::Types"
+
+        ::Gordon::Factory.create_instance(namespace, application_type)
+      end
+    end
+  end
+end
+

data/lib/gordon/application/templates/ruby_web_app.rb

@@ -1,41 +1,38 @@
-$app_name       = ENV['GORDON_APP_NAME']
-$app_desc       = ENV['GORDON_APP_DESC']
-$app_repo       = ENV['GORDON_APP_REPO']
-$app_version    = ENV['GORDON_APP_VERSION']
-#app_depends    = ENV['GORDON_APP_DEPENDS']
-$app_source_dir = ENV['GORDON_APP_SOURCE_DIR']
-
-$skeleton_type  = ENV['GORDON_SKELETON_TYPE']
-$skeleton_files = ENV['GORDON_SKELETON_FILES']
-
-$init_type      = ENV['GORDON_INIT_TYPE']
-$init_build_dir = ENV['GORDON_INIT_BUILD_DIR']
-
 path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'lib'))
 $LOAD_PATH.unshift path
 
 require 'gordon'
 
+$env_vars = Gordon::EnvVars.load
+
 class RubyWebApp < FPM::Cookery::Recipe
   include Gordon::Cookery::Common,
           Gordon::Cookery::Init,
-          Gordon::Cookery::Webserver
+          Gordon::Cookery::ApplicationUser,
+          Gordon::Cookery::HttpServer,
+          Gordon::Cookery::Ruby::Common
 
-  name        $app_name
-  description $app_desc
-  version     $app_version
-  homepage    $app_repo
+  name        $env_vars.app_name
+  description $env_vars.app_desc
+  version     $env_vars.app_version
+  homepage    $env_vars.app_repo
 
-  source      $app_source_dir, with: :local_path
-# depends     $app_depends
+  source      $env_vars.app_source_dir, with: :local_path
 
   def build
-    vendor_gems
+    home_path = get_skeleton_path_from_type($env_vars.http_server_type)
+
+    create_user_and_group(home_path)
+    setup_user_permissions(home_path)
+
+    create_init
+
+    ruby_vendor_gems
   end
 
   def install
-    setup_init_files
-    setup_webserver_files
+    install_init
+    install_http_server_files(RUBY_BLACKLIST_FILES)
   end
 end
 

data/lib/gordon/application/types.rb

@@ -28,14 +28,6 @@ module Gordon
         def get_template ; 'java_standalone_app' ; end
       end
     end
-
-    class Factory
-      def self.create(application_type)
-        namespace = "Application::Types"
-
-        ::Gordon::Factory.create_instance(namespace, application_type)
-      end
-    end
   end
 end
 

data/lib/gordon/cli.rb

@@ -4,18 +4,14 @@ module Gordon
   class CLI
     def self.run
       options = Options.new
-      options.source_dir      = Dir.pwd
-      options.build_dir       = '/tmp'
-      options.package_dir     = Dir.pwd
-      options.init_build_dir  = '/tmp'
+      options.source_dir = Dir.pwd
+      options.output_dir = Dir.pwd
 
       parser = create_option_parser(options)
       parser.parse!
 
-      file_path = File.join(Dir.pwd, 'gordon.yml')
-
       recipe = Recipe.new(options)
-      cooker = Cooker.new(recipe, options)
+      cooker = Cooker.new(recipe)
       cooker.cook
     end
 
@@ -23,19 +19,15 @@ module Gordon
       parser = OptionParser.new do |opts|
         opts.banner = 'Usage: gordon [options]'
 
-        opts.on('-t', '--app-type APP_TYPE', 'Application Type') do |type|
-          options.app_type = type
-        end
-
-        opts.on('-n', '--app-name APP_NAME', 'Application Name') do |name|
+        opts.on('-N', '--app-name APP_NAME', 'Application Name') do |name|
           options.app_name = name
         end
 
-        opts.on('-d', '--app-desc APP_DESC', 'Application Description') do |desc|
+        opts.on('-D', '--app-desc APP_DESC', 'Application Description') do |desc|
           options.app_desc = desc
         end
 
-        opts.on('-r', '--app-repo APP_REPO', 'Application Repository URL') do |repo|
+        opts.on('-R', '--app-repo APP_REPO', 'Application Repository URL') do |repo|
           options.app_repo = repo
         end
 
@@ -43,35 +35,31 @@ module Gordon
           options.app_version = version
         end
 
-        opts.on('-p', '--package-type PACKAGE', 'Package type') do |package_type|
-          options.package_type = package_type
-        end
-
-        opts.on('-P' '--package-dir PACKAGE_DIR', 'Package Directory') do |package_dir|
-          options.package_dir = package_dir
-        end
-
-        opts.on('-s', '--source-dir SOURCE_DIR', 'Source Directory') do |source_dir|
+        opts.on('-S', '--app-source-dir APP_SOURCE_DIR', 'Application Source Directory') do |source_dir|
           options.source_dir = source_dir
         end
 
-        opts.on('-b', '--build-dir BUILD_DIR', 'Build Directory') do |build_dir|
-          options.build_dir = build_dir
+        opts.on('-T', '--app-type APP_TYPE', 'Application Type') do |type|
+          options.app_type = type
         end
 
-        opts.on('-S', '--skeleton-type SKELETON_TYPE', 'Skeleton Type') do |skeleton_type|
-          options.skeleton_type = skeleton_type
+        opts.on('-H', '--http-server-type HTTP_SERVER_TYPE', 'HTTP Server Type') do |http_server_type|
+          options.http_server_type = http_server_type
         end
 
-        opts.on('-i', '--init-type INIT_TYPE', 'Init Type') do |init_type|
+        opts.on('-I', '--init-type INIT_TYPE', 'Init Type') do |init_type|
           options.init_type = init_type
         end
 
-        opts.on('-I', '--init-build-dir INIT_BUILD_DIR', 'Init Build Directory') do |init_build_dir|
-          options.init_build_dir = init_build_dir
+        opts.on('-P', '--package-type PACKAGE', 'Package type') do |package_type|
+          options.package_type = package_type
+        end
+
+        opts.on('-O', '--output-dir OUTPUT_DIR', 'Output Directory') do |output_dir|
+          options.output_dir = output_dir
         end
 
-        opts.on('-D', '--debug DEBUG', 'Debug Mode') do |debug|
+        opts.on('-d', '--debug DEBUG', 'Debug Mode') do |debug|
           options.debug = debug
         end
 
@@ -79,6 +67,11 @@ module Gordon
           puts opts
           exit
         end
+
+        opts.on('-v', '--version', 'Displays Version') do
+          puts VERSION
+          exit
+        end
       end
 
       parser

data/lib/gordon/cooker.rb

@@ -1,55 +1,69 @@
 module Gordon
   class Cooker
-    attr_reader :options, :recipe
+    attr_reader :recipe, :options
 
-    def initialize(recipe, options)
+    FPM_COOKERY_COMMAND   = 'ruby -S fpm-cook'
+    FPM_COOKERY_CACHE_DIR = '/tmp/gordon/cache'
+    FPM_COOKERY_BUILD_DIR = '/tmp/gordon/build'
+
+    def initialize(recipe)
       @recipe = recipe
-      @options = options
+      @options = recipe.options
     end
 
     def cook
-      cook_args = []
+      clean
+      package
+    end
 
-      cook_args << "--debug"    if options.debug?
+    private
 
-      cook_args << "--target #{options.package_type}"
-      cook_args << "--platform #{recipe.platform}" if recipe.requires_platform?
-      cook_args << "--cache-dir #{File.expand_path(options.build_dir)}"
-      cook_args << "--tmp-root #{File.expand_path(options.build_dir)}"
-      cook_args << "--pkg-dir #{File.expand_path(options.package_dir)}"
-      cook_args << "package"
+    def clean
+      cook_args = get_command_args
+
+      cook_args << "clean"
       cook_args << recipe.application_template_path
 
-      env_vars = get_env_vars
-      command = "#{env_vars.join " "} ruby -S fpm-cook #{cook_args.join " "}"
+      execute(cook_args)
+    end
 
-      if options.debug?
-        STDOUT.puts ''
-        STDOUT.puts command
-        STDOUT.puts ''
-      end
+    def package
+      cook_args = get_command_args
 
-      Process.run(command)
+      cook_args << "package"
+      cook_args << recipe.application_template_path
+
+      execute(cook_args)
     end
 
-    private
+    def get_command_args
+      cook_args = []
+
+      cook_args << "--debug"    if options.debug?
+
+      cook_args << "--target #{options.package_type}"
+      cook_args << "--platform #{recipe.platform}" if recipe.requires_platform?
+      cook_args << "--pkg-dir #{File.expand_path(options.output_dir)}"
+      cook_args << "--cache-dir #{File.expand_path(FPM_COOKERY_CACHE_DIR)}"
+      cook_args << "--tmp-root #{File.expand_path(FPM_COOKERY_BUILD_DIR)}"
+
+      cook_args
+    end
 
-    def get_env_vars
-      env_vars = []
+    def execute(cook_args)
+      env_vars = EnvVars.from_cook(options)
 
-      env_vars << "GORDON_APP_NAME=#{options.app_name}"
-      env_vars << "GORDON_APP_DESC=#{options.app_desc}"
-      env_vars << "GORDON_APP_REPO=#{options.app_repo}"
-      env_vars << "GORDON_APP_VERSION=#{options.app_version}"
-      env_vars << "GORDON_APP_SOURCE_DIR=#{File.expand_path(options.source_dir)}"
+      command = "#{env_vars.join " "} #{FPM_COOKERY_COMMAND} #{cook_args.join " "}"
 
-      env_vars << "GORDON_SKELETON_TYPE=#{recipe.skeleton.type}"
-      env_vars << "GORDON_SKELETON_FILES=#{recipe.skeleton.artifacts.join(',')}"
+      debug(command) if options.debug?
 
-      env_vars << "GORDON_INIT_TYPE=#{options.init_type}"
-      env_vars << "GORDON_INIT_BUILD_DIR=#{File.expand_path(options.init_build_dir)}"
+      Process.run(command)
+    end
 
-      env_vars
+    def debug(command)
+      STDOUT.puts ''
+      STDOUT.puts command
+      STDOUT.puts ''
     end
   end
 end

data/lib/gordon/cookery/application_user.rb

@@ -0,0 +1,41 @@
+module Gordon
+  module Cookery
+    module ApplicationUser
+      def create_user_and_group(home_path)
+        File.open(builddir('.gordon-before-install'), 'w', 0755) do |f|
+          bash = <<-__BASH
+#!/bin/sh
+
+set -e
+
+/usr/bin/getent group  #{$env_vars.app_name} >/dev/null || /usr/sbin/groupadd --system #{$env_vars.app_name};
+/usr/bin/getent passwd #{$env_vars.app_name} >/dev/null || /usr/sbin/useradd  --system --gid #{$env_vars.app_name} --home-dir #{home_path} --shell /sbin/nologin --comment "#{$env_vars.app_desc}" #{$env_vars.app_name} >/dev/null || :;
+
+              __BASH
+
+          f.write(bash)
+
+          self.class.pre_install(File.expand_path(f.path))
+        end
+      end
+
+      def setup_user_permissions(home_path)
+        File.open(builddir('.gordon-after-install'), 'w', 0755) do |f|
+          bash = <<-__BASH
+#!/bin/sh
+
+set -e
+
+/usr/bin/chown -R #{$env_vars.app_name}:#{$env_vars.app_name} #{home_path}
+
+              __BASH
+
+          f.write(bash)
+
+          self.class.post_install(File.expand_path(f.path))
+        end
+      end
+    end
+  end
+end
+

data/lib/gordon/cookery/common.rb

@@ -1,16 +1,26 @@
 module Gordon
   module Cookery
     module Common
-      def vendor_gems
-        safesystem('ruby -S bundle install --deployment --without development test')
-      end
+      MAIN_BLACKLIST_FILES = %w(.git .gitignore .pki Vagrantfile)
 
-      def common_ruby_files
-        %w(.bundle Gemfile Gemfile.lock Procfile config.ru vendor)
+      def get_skeleton_path_from_type(type)
+        skeleton_type = Skeleton::Factory.create(type)
+        skeleton_type.path(skeleton_type.requires_app_name? ? $env_vars.app_name : '')
       end
 
-      def get_skeleton_path(skeleton_type)
-        skeleton_type.path(skeleton_type.requires_app_name? ? $app_name : '')
+      def all_files_except_blacklisted(*custom_blacklist_files)
+        blacklist = (MAIN_BLACKLIST_FILES + custom_blacklist_files).flatten
+
+        # TODO: create a way to make a performatic grep here to avoid undesired/directory/*
+        files = Dir['{*,.*}'].sort[2..-1].reject do |entry|
+          pattern = entry.gsub(/\./, '\.').gsub(/\//, '\/')
+
+          found = blacklist.grep(/#{pattern}/i)
+
+          found.any?
+        end
+
+        files
       end
     end
   end

data/lib/gordon/cookery/http_server.rb

@@ -0,0 +1,14 @@
+module Gordon
+  module Cookery
+    module HttpServer
+      def install_http_server_files(blacklist)
+        skeleton_path = get_skeleton_path_from_type($env_vars.http_server_type)
+
+        application_files = all_files_except_blacklisted(blacklist)
+
+        root(skeleton_path).install application_files
+      end
+    end
+  end
+end
+

data/lib/gordon/cookery/init.rb

@@ -1,25 +1,21 @@
 module Gordon
   module Cookery
     module Init
-      def setup_init_files
-        create_init_files
-        install_init_files
-      end
+      def create_init
+        init_build_dir_path = builddir($env_vars.init_type)
 
-      def create_init_files
-        init_build_dir_path = File.join($init_build_dir, $init_type)
+        command = "ruby -S foreman export --app #{$env_vars.app_name} --user #{$env_vars.app_name} #{$env_vars.init_type} #{init_build_dir_path}"
 
-        command = "ruby -S foreman export --app #{$app_name} #{$init_type} #{init_build_dir_path}"
-        ::Gordon::Process.run(command)
+        safesystem(command)
       end
 
-      def install_init_files
-        init_build_dir_path = File.join($init_build_dir, $init_type)
+      def install_init
+        init_build_dir_path = builddir($env_vars.init_type)
 
-        skeleton_type = ::Gordon::Skeleton::Types::Factory.create($init_type)
-        path = get_skeleton_path(skeleton_type)
+        skeleton_path = get_skeleton_path_from_type($env_vars.init_type)
+        skeleton_files = Dir["#{init_build_dir_path}/*"]
 
-        root(path).install Dir["#{init_build_dir_path}/*"]
+        root(skeleton_path).install skeleton_files
       end
     end
   end

data/lib/gordon/cookery/ruby/common.rb

@@ -0,0 +1,18 @@
+module Gordon
+  module Cookery
+    module Ruby
+      module Common
+        RUBY_BLACKLIST_FILES = %w(.rspec coverage log spec tmp)
+
+        def ruby_vendor_gems
+          command = 'ruby -S bundle package --all'
+          safesystem(command)
+
+          command = 'ruby -S bundle install --deployment --without development test'
+          safesystem(command)
+        end
+      end
+    end
+  end
+end
+

data/lib/gordon/env_vars.rb

@@ -0,0 +1,36 @@
+module Gordon
+  class EnvVars
+    attr_accessor :app_name, :app_desc, :app_repo, :app_version, :app_source_dir
+    attr_accessor :http_server_type
+    attr_accessor :init_type
+
+    def self.from_cook(options)
+      env_vars = []
+
+      env_vars << "GORDON_APP_NAME='#{options.app_name}'"
+      env_vars << "GORDON_APP_DESC='#{options.app_desc}'"
+      env_vars << "GORDON_APP_REPO='#{options.app_repo}'"
+      env_vars << "GORDON_APP_VERSION='#{options.app_version}'"
+      env_vars << "GORDON_APP_SOURCE_DIR='#{File.expand_path(options.source_dir)}'"
+      env_vars << "GORDON_HTTP_SERVER_TYPE='#{options.http_server_type}'"
+      env_vars << "GORDON_INIT_TYPE='#{options.init_type}'"
+
+      env_vars
+    end
+
+    def self.load
+      env_vars = self.new
+
+      env_vars.app_name         = ENV['GORDON_APP_NAME']
+      env_vars.app_desc         = ENV['GORDON_APP_DESC']
+      env_vars.app_repo         = ENV['GORDON_APP_REPO']
+      env_vars.app_version      = ENV['GORDON_APP_VERSION']
+      env_vars.app_source_dir   = ENV['GORDON_APP_SOURCE_DIR']
+      env_vars.http_server_type = ENV['GORDON_HTTP_SERVER_TYPE']
+      env_vars.init_type        = ENV['GORDON_INIT_TYPE']
+
+      env_vars
+    end
+  end
+end
+

data/lib/gordon/options.rb

@@ -1,10 +1,11 @@
 module Gordon
   class Options
     attr_accessor :app_type, :app_name, :app_desc, :app_repo, :app_version
-    attr_accessor :package_type, :package_dir
-    attr_accessor :source_dir, :build_dir
-    attr_accessor :skeleton_type
-    attr_accessor :init_type, :init_build_dir
+    attr_accessor :package_type
+    attr_accessor :source_dir
+    attr_accessor :output_dir
+    attr_accessor :http_server_type
+    attr_accessor :init_type
     attr_accessor :debug
 
     def debug? ; !!debug ; end

data/lib/gordon/recipe.rb

@@ -1,12 +1,10 @@
-require 'forwardable'
-
 module Gordon
   class Recipe
-    attr_reader :options, :skeleton
+    attr_reader :options, :application
 
     def initialize(options)
       @options = options
-      @skeleton = Skeleton::Info.new(options.skeleton_type, options.source_dir)
+      @application = Application::Factory.create(options.app_type)
     end
 
     def platform
@@ -23,8 +21,6 @@ module Gordon
     end
 
     def application_template_path
-      application = Application::Factory.create(options.app_type)
-
       application.template_path
     end
   end

data/lib/gordon/skeleton/factory.rb

@@ -0,0 +1,12 @@
+module Gordon
+  module Skeleton
+    class Factory
+      def self.create(skeleton_type)
+        namespace = "Skeleton::Types"
+
+        ::Gordon::Factory.create_instance(namespace, skeleton_type)
+      end
+    end
+  end
+end
+

data/lib/gordon/skeleton/types.rb

@@ -3,7 +3,7 @@ module Gordon
     module Types
       module Base
         def path(app = '')
-          File.join(get_default_path, app)
+          File.join(get_default_path, app.to_s)
         end
 
         def requires_app_name?
@@ -42,14 +42,6 @@ module Gordon
           true
         end
       end
-
-      class Factory
-        def self.create(skeleton_type)
-          namespace = "Skeleton::Types"
-
-          ::Gordon::Factory.create_instance(namespace, skeleton_type)
-        end
-      end
     end
   end
 end

data/lib/gordon/version.rb

@@ -1,3 +1,3 @@
 module Gordon
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/lib/gordon.rb

@@ -4,14 +4,18 @@ module Gordon
   require 'gordon/cli'
   require 'gordon/cooker'
   require 'gordon/recipe'
+  require 'gordon/env_vars'
   require 'gordon/factory'
   require 'gordon/options'
   require 'gordon/process'
+  require 'gordon/application/factory'
   require 'gordon/application/types'
+  require 'gordon/cookery/application_user'
   require 'gordon/cookery/common'
   require 'gordon/cookery/init'
-  require 'gordon/cookery/webserver'
-  require 'gordon/skeleton/info'
+  require 'gordon/cookery/http_server'
+  require 'gordon/cookery/ruby/common'
+  require 'gordon/skeleton/factory'
   require 'gordon/skeleton/types'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gordon
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Marcelo Pinheiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fpm-cookery
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +80,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Gordon is a tool to create artifacts using fpm-cookery and foreman.
+description: Gordon is a tool to create OS packages using fpm-cookery and foreman,
+  based on a lot of conventions.
 email:
 - salizzar@gmail.com
 executables:
@@ -82,18 +97,22 @@ files:
 - bin/gordon
 - gordon.gemspec
 - lib/gordon.rb
+- lib/gordon/application/factory.rb
 - lib/gordon/application/templates/ruby_web_app.rb
 - lib/gordon/application/types.rb
 - lib/gordon/cli.rb
 - lib/gordon/cooker.rb
+- lib/gordon/cookery/application_user.rb
 - lib/gordon/cookery/common.rb
+- lib/gordon/cookery/http_server.rb
 - lib/gordon/cookery/init.rb
-- lib/gordon/cookery/webserver.rb
+- lib/gordon/cookery/ruby/common.rb
+- lib/gordon/env_vars.rb
 - lib/gordon/factory.rb
 - lib/gordon/options.rb
 - lib/gordon/process.rb
 - lib/gordon/recipe.rb
-- lib/gordon/skeleton/info.rb
+- lib/gordon/skeleton/factory.rb
 - lib/gordon/skeleton/types.rb
 - lib/gordon/version.rb
 homepage: https://github.com/salizzar/gordon
@@ -119,5 +138,5 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: A tool to create application artifacts
+summary: A tool to create application OS packages
 test_files: []

data/lib/gordon/cookery/webserver.rb

@@ -1,14 +0,0 @@
-module Gordon
-  module Cookery
-    module Webserver
-      def setup_webserver_files
-        skeleton_type = ::Gordon::Skeleton::Types::Factory.create($skeleton_type)
-        skeleton_path = get_skeleton_path(skeleton_type)
-
-        root(skeleton_path).install common_ruby_files
-        root(skeleton_path).install $skeleton_files.split(',')
-      end
-    end
-  end
-end
-

data/lib/gordon/skeleton/info.rb

@@ -1,28 +0,0 @@
-module Gordon
-  module Skeleton
-    class Info
-      attr_reader :type, :artifacts
-
-      BLACKLIST = %w(.git log spec Vagrantfile coverage tmp/cache)
-
-      def initialize(type, source_dir)
-        @type, @artifacts = type, clean_source_files(source_dir)
-      end
-
-      private
-
-      def clean_source_files(source_dir)
-        source_path = File.join(source_dir, '*')
-
-        all_files = Dir[source_path]
-
-        blacklist = BLACKLIST.map do |file|
-          File.join(source_dir, file)
-        end
-
-        all_files - blacklist
-      end
-    end
-  end
-end
-