gordon 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8807e453ec5c7d49cef487a753959d7a88e53a46
-  data.tar.gz: 3ed6815c1615d8c5a39ee20c862dd509c8b63056
+  metadata.gz: d21831aed237045e8396c6ad00348cfd611aa5e2
+  data.tar.gz: 1400ab3969f8df1a9a097030c6bc6db18737416e
 SHA512:
-  metadata.gz: 2d25d8c05b10dd34c1e7ef11cc7adf9695897f6930efebe2afbee1949e0a636a5fe636c84713e0a7fae07c58ff0ab06052f11a1e92c823fd43c6e6c0eb29c25a
-  data.tar.gz: 9c5fd2889928bb9a481d785c7900e4739021c4bfbc52a07f13820add8bae277f722d9ba4c6a343fb88c4d64d91d247a77fa3a1619b6b7fb29c55b62066b16bc9
+  metadata.gz: a1de1546c9e254b274b837f0cba5b91322eae91db74b13b1a24ba1cd687e6d624d5934c3168c34e1e266284e8a007914fbe7f7152342d24ac3eb6c4ac81065f3
+  data.tar.gz: 38d9b6b2c8554d24c724b63ada72d1372e46cecf6e36adf8c699352fa88dcd7575655393004ecd1dac02d1ab1becd6d7807869ef8a6103d928fff29a507021ed

data/README.md

@@ -42,15 +42,16 @@ Or install it yourself as:
 
 ## Usage
 
-A simple example to build a Ruby Web App that runs Nginx and uses Systemd as init process:
+Here a simple example to build a Ruby Web App that runs Nginx and uses Systemd as init process. Just enter on source folder of your app and run in your terminal:
 
     $ ruby -S gordon                     \
+      --app-type         ruby_web_app    \
       --app-name         $APP_NAME       \
       --app-desc         $APP_DESC       \
       --app-repo         $APP_REPO       \
       --app-version      $APP_VERSION    \
       --app-source-dir   .               \
-      --app-type         ruby_web_app    \
+      --runtime-version  $MRI_VERSION    \
       --http-server-type nginx           \
       --init-type        systemd         \
       --package-type     rpm             \
@@ -82,11 +83,10 @@ Because I like Gordon Ramsay.
 
 ## TODO
 
-* Very unstable, need to fix it
 * Validate outputs
-* Add a way to map package dependencies
-* Adapt to use Debian and other OS conventions for Nginx and Apache
 * Tests
+* Very unstable, need to fix it
+* Debian check (gem heavly developed under CentOS environment)
 
 ## Contributing
 

data/gordon.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "debugger"
 
+  spec.add_dependency "bundler"
   spec.add_dependency "fpm-cookery"
   spec.add_dependency "foreman"
 end

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

@@ -6,6 +6,8 @@ require 'gordon'
 $env_vars = Gordon::EnvVars.load
 
 class RubyWebApp < FPM::Cookery::Recipe
+  extend  Gordon::Cookery::DependencyResolver
+
   include Gordon::Cookery::Common,
           Gordon::Cookery::Init,
           Gordon::Cookery::ApplicationUser,
@@ -19,20 +21,22 @@ class RubyWebApp < FPM::Cookery::Recipe
 
   source      $env_vars.app_source_dir, with: :local_path
 
+  depends     *resolve_dependencies($env_vars)
+
   def build
     home_path = get_skeleton_path_from_type($env_vars.http_server_type)
 
-    create_user_and_group(home_path)
-    setup_user_permissions(home_path)
+    create_user_and_group($env_vars, home_path)
+    setup_user_permissions($env_vars, home_path)
 
-    create_init
+    create_init($env_vars)
 
     ruby_vendor_gems
   end
 
   def install
-    install_init
-    install_http_server_files(RUBY_BLACKLIST_FILES)
+    install_init($env_vars)
+    install_http_server_files($env_vars, RUBY_BLACKLIST_FILES)
   end
 end
 

data/lib/gordon/cli.rb

@@ -4,7 +4,7 @@ module Gordon
   class CLI
     def self.run
       options = Options.new
-      options.source_dir = Dir.pwd
+      options.app_source_dir = Dir.pwd
       options.output_dir = Dir.pwd
 
       parser = create_option_parser(options)
@@ -19,28 +19,32 @@ module Gordon
       parser = OptionParser.new do |opts|
         opts.banner = 'Usage: gordon [options]'
 
-        opts.on('-N', '--app-name APP_NAME', 'Application Name') do |name|
-          options.app_name = name
+        opts.on('-T', '--app-type APP_TYPE', 'Application Type') do |app_type|
+          options.app_type = app_type
         end
 
-        opts.on('-D', '--app-desc APP_DESC', 'Application Description') do |desc|
-          options.app_desc = desc
+        opts.on('-N', '--app-name APP_NAME', 'Application Name') do |app_name|
+          options.app_name = app_name
         end
 
-        opts.on('-R', '--app-repo APP_REPO', 'Application Repository URL') do |repo|
-          options.app_repo = repo
+        opts.on('-D', '--app-desc APP_DESC', 'Application Description') do |app_desc|
+          options.app_desc = app_desc
         end
 
-        opts.on('-V', '--app-version APP_VERSION', 'Application Version') do |version|
-          options.app_version = version
+        opts.on('-R', '--app-repo APP_REPO', 'Application Repository URL') do |app_repo|
+          options.app_repo = app_repo
         end
 
-        opts.on('-S', '--app-source-dir APP_SOURCE_DIR', 'Application Source Directory') do |source_dir|
-          options.source_dir = source_dir
+        opts.on('-V', '--app-version APP_VERSION', 'Application Version') do |app_version|
+          options.app_version = app_version
         end
 
-        opts.on('-T', '--app-type APP_TYPE', 'Application Type') do |type|
-          options.app_type = type
+        opts.on('-S', '--app-source-dir APP_SOURCE_DIR', 'Application Source Directory') do |app_source_dir|
+          options.app_source_dir = app_source_dir
+        end
+
+        opts.on('-R', '--runtime-version RUNTIME_VERSION', 'Runtime Version') do |runtime_version|
+          options.runtime_version = runtime_version
         end
 
         opts.on('-H', '--http-server-type HTTP_SERVER_TYPE', 'HTTP Server Type') do |http_server_type|
@@ -59,7 +63,7 @@ module Gordon
           options.output_dir = output_dir
         end
 
-        opts.on('-d', '--debug DEBUG', 'Debug Mode') do |debug|
+        opts.on('-d', '--debug', 'Debug Mode') do |debug|
           options.debug = debug
         end
 

data/lib/gordon/cooker.rb

@@ -46,6 +46,7 @@ module Gordon
       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 << "--no-deps"
 
       cook_args
     end

data/lib/gordon/cookery/application_user.rb

@@ -1,15 +1,15 @@
 module Gordon
   module Cookery
     module ApplicationUser
-      def create_user_and_group(home_path)
+      def create_user_and_group(env_vars, 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 || :;
+/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
 
@@ -19,14 +19,14 @@ set -e
         end
       end
 
-      def setup_user_permissions(home_path)
+      def setup_user_permissions(env_vars, 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}
+/usr/bin/chown -R #{env_vars.app_name}:#{env_vars.app_name} #{home_path}
 
               __BASH
 

data/lib/gordon/cookery/common.rb

@@ -3,8 +3,12 @@ module Gordon
     module Common
       MAIN_BLACKLIST_FILES = %w(.git .gitignore .pki Vagrantfile)
 
+      def self.included(base)
+        base.send(:extend, self)
+      end
+
       def get_skeleton_path_from_type(type)
-        skeleton_type = Skeleton::Factory.create(type)
+        skeleton_type = create_skeleton_type(type)
         skeleton_type.path(skeleton_type.requires_app_name? ? $env_vars.app_name : '')
       end
 
@@ -22,6 +26,10 @@ module Gordon
 
         files
       end
+
+      def create_skeleton_type(type)
+        Skeleton::Factory.create(type)
+      end
     end
   end
 end

data/lib/gordon/cookery/dependency_resolver.rb

@@ -0,0 +1,43 @@
+module Gordon
+  module Cookery
+    module DependencyResolver
+      def resolve_dependencies(env_vars)
+        fragments = env_vars.app_type.split('_')
+        app_runtime, app_type = fragments[0], fragments[1]
+
+        dependencies = []
+        dependencies << get_runtime_package_name(app_runtime, env_vars)
+        dependencies << get_http_server_package_name(env_vars) if app_type == 'web'
+        dependencies << get_init_package_name(env_vars)
+
+        dependencies.collect(&:to_s)
+      end
+
+      private
+
+      def get_runtime_package_name(app_runtime, env_vars)
+        runtime_version = "#{app_runtime} = #{env_vars.runtime_version}"
+
+        runtime_version
+      end
+
+      def get_http_server_package_name(env_vars)
+        get_os_package_name(env_vars, :http_server_type)
+      end
+
+      def get_init_package_name(env_vars)
+        get_os_package_name(env_vars, :init_type)
+      end
+
+      def get_os_package_name(env_vars, attribute)
+        package_type = FPM::Cookery::Facts.platform.to_sym
+
+        skeleton_type = create_skeleton_type(env_vars.send(attribute))
+        os_package_name = skeleton_type.get_os_package_map[package_type]
+
+        os_package_name
+      end
+    end
+  end
+end
+

data/lib/gordon/cookery/http_server.rb

@@ -1,8 +1,8 @@
 module Gordon
   module Cookery
     module HttpServer
-      def install_http_server_files(blacklist)
-        skeleton_path = get_skeleton_path_from_type($env_vars.http_server_type)
+      def install_http_server_files(env_vars, blacklist)
+        skeleton_path = get_skeleton_path_from_type(env_vars.http_server_type)
 
         application_files = all_files_except_blacklisted(blacklist)
 

data/lib/gordon/cookery/init.rb

@@ -1,18 +1,18 @@
 module Gordon
   module Cookery
     module Init
-      def create_init
-        init_build_dir_path = builddir($env_vars.init_type)
+      def create_init(env_vars)
+        init_build_dir_path = builddir(env_vars.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 #{env_vars.app_name} --user #{env_vars.app_name} #{env_vars.init_type} #{init_build_dir_path}"
 
         safesystem(command)
       end
 
-      def install_init
-        init_build_dir_path = builddir($env_vars.init_type)
+      def install_init(env_vars)
+        init_build_dir_path = builddir(env_vars.init_type)
 
-        skeleton_path = get_skeleton_path_from_type($env_vars.init_type)
+        skeleton_path = get_skeleton_path_from_type(env_vars.init_type)
         skeleton_files = Dir["#{init_build_dir_path}/*"]
 
         root(skeleton_path).install skeleton_files

data/lib/gordon/env_vars.rb

@@ -1,17 +1,20 @@
 module Gordon
   class EnvVars
-    attr_accessor :app_name, :app_desc, :app_repo, :app_version, :app_source_dir
+    attr_accessor :app_type, :app_name, :app_desc, :app_repo, :app_version, :app_source_dir
+    attr_accessor :runtime_version
     attr_accessor :http_server_type
     attr_accessor :init_type
 
     def self.from_cook(options)
       env_vars = []
 
+      env_vars << "GORDON_APP_TYPE='#{options.app_type}'"
       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_APP_SOURCE_DIR='#{File.expand_path(options.app_source_dir)}'"
+      env_vars << "GORDON_RUNTIME_VERSION='#{options.runtime_version}'"
       env_vars << "GORDON_HTTP_SERVER_TYPE='#{options.http_server_type}'"
       env_vars << "GORDON_INIT_TYPE='#{options.init_type}'"
 
@@ -21,11 +24,13 @@ module Gordon
     def self.load
       env_vars = self.new
 
+      env_vars.app_type         = ENV['GORDON_APP_TYPE']
       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.runtime_version  = ENV['GORDON_RUNTIME_VERSION']
       env_vars.http_server_type = ENV['GORDON_HTTP_SERVER_TYPE']
       env_vars.init_type        = ENV['GORDON_INIT_TYPE']
 

data/lib/gordon/options.rb

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

data/lib/gordon/recipe.rb

@@ -9,11 +9,11 @@ module Gordon
 
     def platform
       map = {
-        'rpm' => 'centos',
-        'deb' => 'debian',
+        rpm: :centos,
+        deb: :debian,
       }
 
-      map[options.package_type]
+      map[options.package_type.to_sym]
     end
 
     def requires_platform?

data/lib/gordon/skeleton/types.rb

@@ -14,29 +14,35 @@ module Gordon
       class Nginx
         include Base
 
+        def get_os_package_map ; { centos: :nginx, debian: :nginx } ; end
+
         def get_default_path ; '/usr/share/nginx/html' ; end
       end
 
-      class Httpd
+      class Apache
         include Base
 
+        def get_os_package_map ; { centos: :httpd, debian: :apache2 } ; end
+
         def get_default_path ; '/var/www/html' ; end
       end
 
-      class Misc
+      class Systemd
         include Base
 
-        def get_default_path ; '/opt' ; end
+        def get_os_package_map ; { centos: :systemd, debian: :systemd } ; end
+
+        def get_default_path ; '/usr/lib/systemd/system' ; end
 
         def requires_app_name?
           true
         end
       end
 
-      class Systemd
+      class Misc
         include Base
 
-        def get_default_path ; '/usr/lib/systemd/system' ; end
+        def get_default_path ; '/opt' ; end
 
         def requires_app_name?
           true

data/lib/gordon/version.rb

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

data/lib/gordon.rb

@@ -12,6 +12,7 @@ module Gordon
   require 'gordon/application/types'
   require 'gordon/cookery/application_user'
   require 'gordon/cookery/common'
+  require 'gordon/cookery/dependency_resolver'
   require 'gordon/cookery/init'
   require 'gordon/cookery/http_server'
   require 'gordon/cookery/ruby/common'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gordon
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Marcelo Pinheiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
@@ -104,6 +118,7 @@ files:
 - lib/gordon/cooker.rb
 - lib/gordon/cookery/application_user.rb
 - lib/gordon/cookery/common.rb
+- lib/gordon/cookery/dependency_resolver.rb
 - lib/gordon/cookery/http_server.rb
 - lib/gordon/cookery/init.rb
 - lib/gordon/cookery/ruby/common.rb