gordon 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0791b1bd7bc5327593a6e37cdc185b0d13e8ea8
-  data.tar.gz: 59d54ac3399fa0d7a44a32f1f0c292f525d8cf10
+  metadata.gz: 92355b0ef213be4b1cf55eceeea64e67c32e13f3
+  data.tar.gz: 8f4257916fc921dd70dc09168684965551d7d923
 SHA512:
-  metadata.gz: f15e13158890ca69f6702916b594097c4d3dffd1c996431a9770371b46db024bab6fe811afbe50d9703c264456b67c40cbafc07618d0dea10b3142067c0e2a99
-  data.tar.gz: ed592c91f32be8160815aa9dde3ad7543191257680cc32b8f74b70fccf42d2585c9173fc41495fced2e9c7fb48b5b0c322e2b74a4df3614e185f89d6582adc62
+  metadata.gz: 97f28ad1766b41487f41716a0347e78b029046151c926f6324b3aa8e4350b3d63319e1a5d313e38c4a8c4d2c24f3c535bfb89f1d4cbb7899e73022e7724cbd6a
+  data.tar.gz: 6d384435ab5c0e29b19ccd19d956e0d89163e3ca3dbc76c78bdbd8c1f05410c959c27a9e07f60b8e7bfdde62124b8601ec7d64369871f3c74c6564d84c7ffb87

data/README.md

@@ -58,24 +58,25 @@ First, you need to vendorize all gems in deployment mode:
 
 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         web             \
-      --app-name         $APP_NAME       \
-      --app-desc         $APP_DESC       \
-      --app-home         $APP_HOME       \
-      --app-version      $APP_VERSION    \
-      --app-source       .               \
-      --runtime-name     ruby            \
-      --runtime-version  $MRI_VERSION    \
-      --http-server-type nginx           \
-      --init-type        systemd         \
-      --package-type     rpm             \
+    $ ruby -S gordon                                      \
+      --app-type         web                              \
+      --app-name         my-app                           \
+      --app-description  "my app"                         \
+      --app-homepage     https://github.com/myuser/my-app \
+      --app-version      1.0.0                            \
+      --app-source       .                                \
+      --runtime-name     ruby                             \
+      --runtime-version  2.2.0                            \
+      --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/*all-systemd-stuff*
+* /var/log/*app-name*
 
 Due for conventions, remember:
 
@@ -113,7 +114,7 @@ Because I like Gordon Ramsay.
 ## TODO
 
 * Add Oracle JRE support for Debian (oracle-jre-installer?)
-* Validate outputs
+* Validate inputs
 * Debian check (gem heavly developed under CentOS environment)
 
 ## Contributing

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

@@ -10,6 +10,7 @@ class RubyStandaloneApp < FPM::Cookery::Recipe
 
   include Gordon::Cookery::Common,
           Gordon::Cookery::Init,
+          Gordon::Cookery::Log,
           Gordon::Cookery::ApplicationUser,
           Gordon::Cookery::Standalone,
           Gordon::Cookery::Ruby::Common
@@ -23,6 +24,9 @@ class RubyStandaloneApp < FPM::Cookery::Recipe
 
   depends     *resolve_dependencies($env_vars, platform)
 
+  fpm_attributes["#{FPM::Cookery::Facts.target}_user".to_sym]   = $env_vars.app_name
+  fpm_attributes["#{FPM::Cookery::Facts.target}_group".to_sym]  = $env_vars.app_name
+
   def build
     home_path = get_skeleton_path_from_type($env_vars, :misc)
 
@@ -33,6 +37,8 @@ class RubyStandaloneApp < FPM::Cookery::Recipe
   end
 
   def install
+    create_log_folder($env_vars)
+
     install_init($env_vars)
     install_standalone_files($env_vars, RUBY_BLACKLIST_FILES)
   end

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

@@ -10,6 +10,7 @@ class RubyWebApp < FPM::Cookery::Recipe
 
   include Gordon::Cookery::Common,
           Gordon::Cookery::Init,
+          Gordon::Cookery::Log,
           Gordon::Cookery::ApplicationUser,
           Gordon::Cookery::HttpServer,
           Gordon::Cookery::Ruby::Common
@@ -23,6 +24,9 @@ class RubyWebApp < FPM::Cookery::Recipe
 
   depends     *resolve_dependencies($env_vars, platform)
 
+  fpm_attributes["#{FPM::Cookery::Facts.target}_user".to_sym]   = $env_vars.app_name
+  fpm_attributes["#{FPM::Cookery::Facts.target}_group".to_sym]  = $env_vars.app_name
+
   def build
     home_path = get_skeleton_path_from_type($env_vars, $env_vars.http_server_type)
 
@@ -33,6 +37,8 @@ class RubyWebApp < FPM::Cookery::Recipe
   end
 
   def install
+    create_log_folder($env_vars)
+
     install_init($env_vars)
     install_http_server_files($env_vars, RUBY_BLACKLIST_FILES)
   end

data/lib/gordon/cookery/log.rb

@@ -0,0 +1,12 @@
+module Gordon
+  module Cookery
+    module Log
+      def create_log_folder(env_vars)
+        log_path = "/var/log/#{env_vars.app_name}"
+
+        root(log_path).mkdir
+      end
+    end
+  end
+end
+

data/lib/gordon/version.rb

@@ -1,3 +1,3 @@
 module Gordon
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

data/lib/gordon.rb

@@ -18,6 +18,7 @@ module Gordon
   require 'gordon/cookery/java/web_app'
   require 'gordon/cookery/init'
   require 'gordon/cookery/http_server'
+  require 'gordon/cookery/log'
   require 'gordon/cookery/ruby/common'
   require 'gordon/cookery/standalone'
   require 'gordon/cookery/web_server'

data/spec/gordon/cookery/log_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Gordon::Cookery::Log do
+  subject do
+    class MyLog
+      include Gordon::Cookery::Log
+    end.new
+  end
+
+  let(:app_name)  { "gordon" }
+  let(:log_path)  { "/var/log/#{app_name}" }
+  let(:env_vars)  { instance_double Gordon::EnvVars }
+
+  it 'creates folder' do
+    expect(env_vars).to receive(:app_name).and_return(app_name)
+
+    path_helper = instance_double 'A fpm cookery path helper'
+    expect(subject).to receive(:root).with(log_path).and_return(path_helper)
+    expect(path_helper).to receive(:mkdir)
+
+    subject.create_log_folder(env_vars)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gordon
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Marcelo Pinheiro
@@ -98,6 +98,7 @@ files:
 - lib/gordon/cookery/init.rb
 - lib/gordon/cookery/java/common.rb
 - lib/gordon/cookery/java/web_app.rb
+- lib/gordon/cookery/log.rb
 - lib/gordon/cookery/ruby/common.rb
 - lib/gordon/cookery/standalone.rb
 - lib/gordon/cookery/web_server.rb
@@ -124,6 +125,7 @@ files:
 - spec/gordon/cookery/init_spec.rb
 - spec/gordon/cookery/java/common_spec.rb
 - spec/gordon/cookery/java/web_app_spec.rb
+- spec/gordon/cookery/log_spec.rb
 - spec/gordon/cookery/ruby/common_spec.rb
 - spec/gordon/cookery/standalone_spec.rb
 - spec/gordon/cookery/web_server_spec.rb
@@ -173,6 +175,7 @@ test_files:
 - spec/gordon/cookery/init_spec.rb
 - spec/gordon/cookery/java/common_spec.rb
 - spec/gordon/cookery/java/web_app_spec.rb
+- spec/gordon/cookery/log_spec.rb
 - spec/gordon/cookery/ruby/common_spec.rb
 - spec/gordon/cookery/standalone_spec.rb
 - spec/gordon/cookery/web_server_spec.rb