gordon 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9f8efe52ee3bd5876f355540c996a8651fe78d5
-  data.tar.gz: ac8f7fca341bbba05bd1ae012c36d2cfd1904309
+  metadata.gz: 2f6c92da32b5f718a9c6e40061d550a397e44e1d
+  data.tar.gz: 58e7c34da8d28dc869589d2c9b52a19a45e2a95f
 SHA512:
-  metadata.gz: b89bd962c396966d1708cd09f8e054bc8658e2806108166d28c759bf71d608c8b5949233e2d7158aa97f45556f0c8c7a8cdf0d4a186e9fe7ef1985587e5e941c
-  data.tar.gz: 2f134d3478e0658a3eb9a1175eaa2141de00f76d6afa5738ab6188afc10ce5d4262cf9858e0a01414616eb09c7c59ab919317c5e24d3e42648a1357d483b7a42
+  metadata.gz: c13ff0c341f5787bd0db48d1fc6cf85546efcb06b39334a7e93d5a9af5ec9b8f10c3893846593508c4379673b583b96152f33742d837bef0f1258bfcfbbe8dd3
+  data.tar.gz: a81f165ee34ee5a8bc3595812e94e7f26c5747083ad55c66c59c86b41168e788be10b21f6bc5e169c5df92209ff281c72bb47c4e82ff9cc3b9730a498ea3a9e2

data/gordon.gemspec

@@ -18,9 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "debugger"
   spec.add_development_dependency "rspec"
 
   spec.add_dependency "bundler"

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

@@ -0,0 +1,39 @@
+path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'lib'))
+$LOAD_PATH.unshift path
+
+require 'gordon'
+
+$env_vars = Gordon::EnvVars.load
+
+class JavaWebApp < FPM::Cookery::Recipe
+  extend  Gordon::Cookery::DependencyResolver
+
+  include Gordon::Cookery::Common,
+          Gordon::Cookery::WebServer,
+          Gordon::Cookery::Java::Common,
+          Gordon::Cookery::Java::WebApp
+
+  name        $env_vars.app_name
+  description $env_vars.app_desc
+  version     $env_vars.app_version
+  homepage    $env_vars.app_repo
+  arch        :noarch
+
+  source      $env_vars.app_source_dir, with: :local_path
+
+  depends     *resolve_dependencies($env_vars)
+
+  fpm_attributes[:rpm_user]   = 'tomcat'
+  fpm_attributes[:rpm_group]  = 'tomcat'
+
+  def build
+    war_path = File.join(get_skeleton_path_from_type($env_vars.web_server_type), $env_vars.app_name)
+
+    clean_java_web_workdir($env_vars, war_path)
+  end
+
+  def install
+    install_web_server_files($env_vars, JAVA_BLACKLIST_FILES)
+  end
+end
+

data/lib/gordon/cli.rb

@@ -51,6 +51,10 @@ module Gordon
           options.http_server_type = http_server_type
         end
 
+        opts.on('-W', '--web-server-type WEB_SERVER_TYPE', 'Web Server Type') do |web_server_type|
+          options.web_server_type = web_server_type
+        end
+
         opts.on('-I', '--init-type INIT_TYPE', 'Init Type') do |init_type|
           options.init_type = init_type
         end

data/lib/gordon/cookery/application_user.rb

@@ -10,8 +10,7 @@ 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
+          __BASH
 
           f.write(bash)
 
@@ -27,8 +26,7 @@ set -e
 set -e
 
 /usr/bin/chown -R #{env_vars.app_name}:#{env_vars.app_name} #{home_path}
-
-              __BASH
+          __BASH
 
           f.write(bash)
 

data/lib/gordon/cookery/dependency_resolver.rb

@@ -7,8 +7,9 @@ module Gordon
 
         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 << get_http_server_package_name(env_vars)  unless env_vars.http_server_type.empty?
+        dependencies << get_init_package_name(env_vars)         unless env_vars.init_type.empty?
+        dependencies << get_web_server_package_name(env_vars)   unless env_vars.web_server_type.empty?
 
         dependencies.collect(&:to_s)
       end
@@ -16,7 +17,14 @@ module Gordon
       private
 
       def get_runtime_package_name(app_runtime, env_vars)
-        runtime_version = "#{app_runtime} = #{env_vars.runtime_version}"
+        if app_runtime == 'java'
+          # TODO: get a way to handle openjdk
+          runtime_name = :jre
+
+          runtime_version = "#{runtime_name}#{env_vars.runtime_version}"
+        else
+          runtime_version = "#{runtime_name} = #{env_vars.runtime_version}"
+        end
 
         runtime_version
       end
@@ -29,6 +37,10 @@ module Gordon
         get_os_package_name(env_vars, :init_type)
       end
 
+      def get_web_server_package_name(env_vars)
+        get_os_package_name(env_vars, :web_server_type)
+      end
+
       def get_os_package_name(env_vars, attribute)
         package_type = FPM::Cookery::Facts.platform.to_sym
 

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

@@ -0,0 +1,11 @@
+module Gordon
+  module Cookery
+    module Java
+      module Common
+        JAVA_BLACKLIST_FILES = %w()
+      end
+    end
+  end
+end
+
+

data/lib/gordon/cookery/java/web_app.rb

@@ -0,0 +1,24 @@
+module Gordon
+  module Cookery
+    module Java
+      module WebApp
+        def clean_java_web_workdir(env_vars, workdir_path)
+          File.open(builddir('.gordon-before-install'), 'w', 0755) do |f|
+            bash = <<-__BASH
+#!/bin/sh
+
+set -e
+
+/usr/bin/rm -rf #{workdir_path}
+            __BASH
+
+            f.write(bash)
+
+            self.class.pre_install(File.expand_path(f.path))
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/gordon/cookery/web_server.rb

@@ -0,0 +1,13 @@
+module Gordon
+  module Cookery
+    module WebServer
+      def install_web_server_files(env_vars, blacklist)
+        skeleton_path = get_skeleton_path_from_type(env_vars.web_server_type)
+
+        application_files = all_files_except_blacklisted(blacklist)
+
+        root(skeleton_path).install application_files
+      end
+    end
+  end
+end

data/lib/gordon/env_vars.rb

@@ -3,6 +3,7 @@ module Gordon
     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 :web_server_type
     attr_accessor :init_type
 
     def self.from_cook(options)
@@ -16,6 +17,7 @@ module Gordon
       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_WEB_SERVER_TYPE='#{options.web_server_type}'"
       env_vars << "GORDON_INIT_TYPE='#{options.init_type}'"
 
       env_vars
@@ -32,6 +34,7 @@ module Gordon
       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.web_server_type  = ENV['GORDON_WEB_SERVER_TYPE']
       env_vars.init_type        = ENV['GORDON_INIT_TYPE']
 
       env_vars

data/lib/gordon/options.rb

@@ -3,6 +3,7 @@ module Gordon
     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 :web_server_type
     attr_accessor :init_type
     attr_accessor :package_type
     attr_accessor :output_dir

data/lib/gordon/skeleton/types.rb

@@ -27,6 +27,22 @@ module Gordon
         def get_default_path ; '/var/www/html' ; end
       end
 
+      class Tomcat
+        include Base
+
+        def get_os_package_map ; { centos: :tomcat, debian: :tomcat7 } ; end
+
+        def get_default_path ; '/var/lib/tomcat/webapps' ; end
+      end
+
+      class Jetty
+        include Base
+
+        def get_os_package_map ; { centos: :'jetty-server', debian: :jetty } ; end
+
+        def get_default_path ; '/var/lib/jetty/webapps' ; end
+      end
+
       class Systemd
         include Base
 

data/lib/gordon/version.rb

@@ -1,3 +1,3 @@
 module Gordon
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/gordon.rb

@@ -13,10 +13,13 @@ module Gordon
   require 'gordon/cookery/application_user'
   require 'gordon/cookery/common'
   require 'gordon/cookery/dependency_resolver'
+  require 'gordon/cookery/java/common'
+  require 'gordon/cookery/java/web_app'
   require 'gordon/cookery/init'
   require 'gordon/cookery/http_server'
   require 'gordon/cookery/ruby/common'
   require 'gordon/cookery/standalone'
+  require 'gordon/cookery/web_server'
   require 'gordon/skeleton/factory'
   require 'gordon/skeleton/types'
 end

data/spec/gordon/application/templates/java_web_app_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'JavaWebApp' do
+  describe 'setup' do
+    pending
+  end
+
+  describe 'building' do
+    pending
+  end
+
+  describe 'installing' do
+    pending
+  end
+end
+

data/spec/gordon/cooker_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe Gordon::Cooker do
   describe 'cooking a package' do
-    it 'cleans fpm-cookery working directory' do
+    describe 'cleans fpm-cookery working directory' do
       pending
     end
 
-    it 'packages calling fpm-cookery' do
+    describe 'packages calling fpm-cookery' do
       pending
     end
   end

data/spec/gordon/cookery/java/common_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Gordon::Cookery::Java::Common do
+  describe 'default blacklist files' do
+    pending
+  end
+end
+

data/spec/gordon/cookery/java/web_app_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Gordon::Cookery::Java::WebApp do
+  describe 'cleaning web app workdir before install package' do
+    pending
+  end
+end
+

data/spec/gordon/env_vars_spec.rb

@@ -11,6 +11,7 @@ describe Gordon::EnvVars do
       app_source_dir:   ".",
       runtime_version:  "2.2.0",
       http_server_type: "nginx",
+      web_server_type:  "tomcat",
       init_type:        "systemd",
     }
   end
@@ -28,6 +29,7 @@ describe Gordon::EnvVars do
         "GORDON_APP_SOURCE_DIR='#{File.expand_path(options.app_source_dir)}'",
         "GORDON_RUNTIME_VERSION='#{options.runtime_version}'",
         "GORDON_HTTP_SERVER_TYPE='#{options.http_server_type}'",
+        "GORDON_WEB_SERVER_TYPE='#{options.web_server_type}'",
         "GORDON_INIT_TYPE='#{options.init_type}'",
       ]
 
@@ -46,6 +48,7 @@ describe Gordon::EnvVars do
         'GORDON_APP_SOURCE_DIR'   => options.app_source_dir,
         'GORDON_RUNTIME_VERSION'  => options.runtime_version,
         'GORDON_HTTP_SERVER_TYPE' => options.http_server_type,
+        'GORDON_WEB_SERVER_TYPE'  => options.web_server_type,
         'GORDON_INIT_TYPE'        => options.init_type,
       }
 

data/spec/gordon/skeleton/types_spec.rb

@@ -12,6 +12,14 @@ describe Gordon::Skeleton::Types::Apache do
   pending
 end
 
+describe Gordon::Skeleton::Types::Tomcat do
+  pending
+end
+
+describe Gordon::Skeleton::Types::Jetty do
+  pending
+end
+
 describe Gordon::Skeleton::Types::Systemd do
   pending
 end

metadata

@@ -1,111 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: gordon
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Marcelo Pinheiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: 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: rspec
   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: 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
     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: foreman
   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'
 description: Gordon is a tool to create OS packages using fpm-cookery and foreman,
@@ -117,8 +89,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -127,6 +99,7 @@ files:
 - gordon.gemspec
 - lib/gordon.rb
 - lib/gordon/application/factory.rb
+- lib/gordon/application/templates/java_web_app.rb
 - lib/gordon/application/templates/ruby_standalone_app.rb
 - lib/gordon/application/templates/ruby_web_app.rb
 - lib/gordon/application/types.rb
@@ -137,8 +110,11 @@ files:
 - lib/gordon/cookery/dependency_resolver.rb
 - lib/gordon/cookery/http_server.rb
 - lib/gordon/cookery/init.rb
+- lib/gordon/cookery/java/common.rb
+- lib/gordon/cookery/java/web_app.rb
 - lib/gordon/cookery/ruby/common.rb
 - lib/gordon/cookery/standalone.rb
+- lib/gordon/cookery/web_server.rb
 - lib/gordon/env_vars.rb
 - lib/gordon/factory.rb
 - lib/gordon/options.rb
@@ -147,6 +123,7 @@ files:
 - lib/gordon/skeleton/factory.rb
 - lib/gordon/skeleton/types.rb
 - lib/gordon/version.rb
+- spec/gordon/application/templates/java_web_app_spec.rb
 - spec/gordon/application/templates/ruby_standalone_app_spec.rb
 - spec/gordon/application/templates/ruby_web_app_spec.rb
 - spec/gordon/cli_spec.rb
@@ -156,6 +133,8 @@ files:
 - spec/gordon/cookery/dependency_resolver_spec.rb
 - spec/gordon/cookery/http_server_spec.rb
 - spec/gordon/cookery/init_spec.rb
+- spec/gordon/cookery/java/common_spec.rb
+- spec/gordon/cookery/java/web_app_spec.rb
 - spec/gordon/cookery/ruby/common_spec.rb
 - spec/gordon/cookery/standalone_spec.rb
 - spec/gordon/env_vars_spec.rb
@@ -175,21 +154,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A tool to create application OS packages
 test_files:
+- spec/gordon/application/templates/java_web_app_spec.rb
 - spec/gordon/application/templates/ruby_standalone_app_spec.rb
 - spec/gordon/application/templates/ruby_web_app_spec.rb
 - spec/gordon/cli_spec.rb
@@ -199,6 +179,8 @@ test_files:
 - spec/gordon/cookery/dependency_resolver_spec.rb
 - spec/gordon/cookery/http_server_spec.rb
 - spec/gordon/cookery/init_spec.rb
+- spec/gordon/cookery/java/common_spec.rb
+- spec/gordon/cookery/java/web_app_spec.rb
 - spec/gordon/cookery/ruby/common_spec.rb
 - spec/gordon/cookery/standalone_spec.rb
 - spec/gordon/env_vars_spec.rb