buildable 1.3.4 → 1.4.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2ViNGI3Yjc5MTAyZjExZDBlODhjMzU5ZGQ1YzY2ODMxZTFlYTk0Yg==
-  data.tar.gz: !binary |-
-    YzU0YWE5ZTg4M2E5NDc4NGQ4MDU4MjBkZGNmOWIxYzk1Mjg0N2M2Mg==
+SHA1:
+  metadata.gz: 3fb6431892645540bda1486ee99ec7df9dc528ae
+  data.tar.gz: 340f3df09f4afef6ea3939ccfbfd76948726cc80
 SHA512:
-  metadata.gz: !binary |-
-    OGQ1ODJjZjI2MzgxMDhjZTA0ZjJkMjI1MTA4ZGJlMjQyOTE1MWYyNTI5MzEx
-    MmFmZDY3MmQzMGIxNTk0NjY2ZDRkMDBhZmMyYjg1MjM5NjQ1OWFjNWRiYWQ2
-    NzEyYjFjNGY2NGMxMTJiZWIwNzM3ZGMzZjUxZWZmN2Y1OTcxZmI=
-  data.tar.gz: !binary |-
-    OGZiN2Q3ZGYxOWY0NTNhMzkzNGM4NTM0OGU4NDlhZDQzOGRmNThiZTVkOTJj
-    ZjlhMjJmYTZiMWM0ZjliZGUwMTJkMTQwYmMxZTkyMjJkMDk0MDliYWRjZTFj
-    NWQ2NGIxNWEyN2YwNzZmMDIzMTRmYzlkM2UyMmVlMDQzYmMxNzk=
+  metadata.gz: 93a0e892bad4a7108959c1c6e055afba8c15ec4c3aeedd133a88888b7eadb4d65ebe279cfe185869947daaf283fd1776ef6522136a7e956a0d27ea59becc6ebf
+  data.tar.gz: c2dbddb901773230271e0a1dd92d5098ce5004692ea4a04dc76128d8999655d5b4af4c2dfcfea31b020e857759bf324d2d176207ea4c63cfd07369ae5fcd2fe4

data/README.md

@@ -12,7 +12,9 @@ Sim criar gem é muito mais simples, se você estiver fazendo algo para rubistas
 Primeiramente adicione o *Buildable* no seu Gemfile
 
 ```
-  gem 'buildable'
+  group :build do
+    gem 'buildable'
+  end
 ```
 
 Execute o bunlder para instalar a gem
@@ -23,14 +25,15 @@ Execute o bunlder para instalar a gem
 
 Agora basta criar os arquivos de configuração do seu projeto (este passo é feito apenas uma vez)
 
-```bash
+```shell
   $ buildable init
 ```
 
 Este comando criará os seguintes arquivos:
 
-#TO BE CONTINUED
-
+* .buildable.yml: arquivo de configuração do projeto
+* production.env: arquivo de configuração do ambiente (ver: [foreman](https://github.com/ddollar/foreman))
+* Procfile: arquivo de configuração do executável (ver: [foreman](https://github.com/ddollar/foreman))
 
 O Buildable pode ser utilizado de duas formas seu executável ou via rake (ideal para automatização do build), 
 

data/buildable.gemspec

@@ -8,17 +8,18 @@ Gem::Specification.new do |spec|
   spec.version       = Buildable::VERSION
   spec.authors       = ["Alexandre Prates"]
   spec.email         = ["ajfprates@gmail.com"]
-  spec.summary       = %q{Gem para criar pacotes (debian) para deploy de projetos ruby.}
+  spec.summary       = %q{Gem para criação de pacotes deb}
+  spec.description   = %q{Gem para criação de pacotes deb para distribuição de seus projetos em ambientes Debian}
   spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/r7com/buildable'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ["lib", "lib/tasks", "lib/buildable"]
 
-  spec.add_runtime_dependency "rake"
-  spec.add_runtime_dependency "fpm", ">= 1.3.3"
-  spec.add_runtime_dependency "foreman", ">= 0.78.0"
-  spec.add_runtime_dependency "foreman-export-initscript"
-  spec.add_runtime_dependency "configureasy", ">= 1.0.0"
+  spec.add_runtime_dependency "rake", '~> 0'
+  spec.add_runtime_dependency 'fpm', '~> 1.3', '>= 1.3.3'
+  spec.add_runtime_dependency 'foreman', '~> 0.78', '>= 0.78.0'
+  spec.add_runtime_dependency 'configureasy', '~> 1.0', '>= 1.0.0'
 end

data/lib/buildable.rb

@@ -1,5 +1,4 @@
-require 'bundler'
-Bundler.require(:default)
+require 'configureasy'
 
 module Buildable
   require_relative 'core_ext/hash'
@@ -9,7 +8,7 @@ module Buildable
   require_relative 'buildable/recipe'
   require_relative 'buildable/rake_helper'
 
-  include Configureasy
+  include ::Configureasy
   load_config '.buildable', as: 'config', path: '.'
 
   BUILD_DIR      = './.build'

data/lib/buildable/recipes/build.rb

@@ -26,6 +26,7 @@ module Buildable::Recipe
   end
 
   recipe :make_init_script do
+    # To make the initd script i'm using foreman's bluepill export with custom template
     puts "* Generating init scripts"
     params = {
       '--user' => Buildable.config.app_user,
@@ -36,10 +37,11 @@ module Buildable::Recipe
       '-f' => 'Procfile',
       '-d' => Buildable.config.root_dir
     }
-    Buildable::Shell.do "foreman export initscript #{Buildable.initd_folder}", params
-
+    Buildable::Shell.do "foreman export bluepill #{Buildable.initd_folder}", params
     raise "Can't generate init scripts" unless Buildable::Shell.success?
+
     initscript = File.join Buildable.initd_folder, Buildable.config.project_name
+    FileUtils.move "#{initscript}.pill", initscript
     FileUtils.chmod "+x", initscript
   end
 
@@ -61,7 +63,7 @@ module Buildable::Recipe
       '-C' => "#{Buildable::BUILD_ROOT_DIR} ."
     }
 
-    result = Buildable::Shell.do_quiet 'bundle exec fpm', params
+    result = Buildable::Shell.do_quiet 'fpm', params
     raise "Can't create package, error:\n#{result}" unless Buildable::Shell.success?
     package_name = result.match(/:path=>"\.\/pkg\/([^"]*)/)[1]
     puts "\tPackage created #{package_name}"

data/lib/buildable/version.rb

@@ -1,3 +1,3 @@
 module Buildable
-  VERSION = "1.3.4"
+  VERSION = "1.4.2"
 end

data/templates/foreman/master.pill.erb

@@ -0,0 +1,109 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          <%= app %>
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Generated initscript for <%= app %>
+# Description:       This file starts <%= app %>. It should be placed in /etc/init.d
+### END INIT INFO
+
+# Auto generated by Buildable
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+NAME=<%= app %>
+USERNAME=<%= user %>
+<% engine.each_process do |name, process| -%>
+<%= name %>_pidfile=/var/run/<%= app %>_<%= name %>.pid
+<% end -%>
+
+[ -r /lib/lsb/init-functions ] &&. /lib/lsb/init-functions
+
+#
+# Function that starts the service
+#
+do_start()
+{
+<% engine.each_process do |name, process| -%>
+  log_daemon_msg "start <%= name %>"
+  <%= name %>_running
+  if [ $? -ne 0 ]; then
+    start_<%= name %>
+  else
+    log_end_msg 1
+    log_action_msg "<%= name %> it is already running!"
+  fi
+
+<% end -%>
+}
+
+#
+# Function that stops the service
+#
+do_stop()
+{
+<% engine.each_process do |name, process| -%>
+  log_daemon_msg "stop <%= name %>"
+  kill `cat $<%= name %>_pidfile 2> /dev/null` 2> /dev/null &&  rm $<%= name %>_pidfile 2> /dev/null
+  log_end_msg $?
+
+<% end -%>
+}
+
+#
+# Function to show service status
+#
+show_status()
+{
+<% engine.process_names.each do |name| -%>
+  <%= name %>_running && log_action_msg "<%= app %> <%= name %> is running!" || log_action_msg "<%= app %> <%= name %> is not running"
+
+<% end -%>
+}
+
+
+#
+# Support functions
+#
+<% engine.each_process do |name, process| -%>
+start_<%= name %>()
+{
+  su - $USERNAME <<EOS | cut -d ' ' -f 2 > $<%= name %>_pidfile
+  cd <%= engine.root %>
+  <%= engine.environment.collect { |k,v| "#{k}=#{v} " }.join %><%= process.command %> > /dev/null 2>&1 &
+  jobs -l
+EOS
+  log_end_msg $?
+}
+
+<%= name %>_running()
+{
+  ps -p $(cat $<%= name %>_pidfile 2> /dev/null) > /dev/null 2>&1
+}
+
+<% end -%>
+
+case "$1" in
+  start)
+    log_action_msg "Starting $NAME"
+    do_start
+    ;;
+  stop)
+    log_action_msg "Stopping $NAME"
+    do_stop
+    ;;
+  status)
+    show_status
+    ;;
+  restart)
+    log_action_msg "Restarting $NAME"
+    do_stop
+    sleep 1
+    do_start
+    ;;
+  *)
+  echo "Usage: <%= app %> {start|stop|status|restart}" >&2
+  exit 3
+  ;;
+esac

metadata

@@ -1,86 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: buildable
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.2
 platform: ruby
 authors:
 - Alexandre Prates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.78.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+        version: '0.78'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.78.0
-- !ruby/object:Gem::Dependency
-  name: foreman-export-initscript
-  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'
+        version: '0.78'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.78.0
 - !ruby/object:Gem::Dependency
   name: configureasy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: 
+description: Gem para criação de pacotes deb para distribuição de seus projetos em
+  ambientes Debian
 email:
 - ajfprates@gmail.com
 executables:
@@ -88,8 +93,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -107,9 +111,9 @@ files:
 - lib/core_ext/hash.rb
 - templates/.buildable.yml.erb
 - templates/Procfile.erb
-- templates/foreman/master.erb
+- templates/foreman/master.pill.erb
 - templates/production.env.erb
-homepage: 
+homepage: https://github.com/r7com/buildable
 licenses:
 - MIT
 metadata: {}
@@ -121,18 +125,18 @@ require_paths:
 - lib/buildable
 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.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Gem para criar pacotes (debian) para deploy de projetos ruby.
+summary: Gem para criação de pacotes deb
 test_files: []

data/.ruby-version

@@ -1 +0,0 @@
-1.9.3-p448

data/templates/foreman/master.erb

@@ -1,97 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          <%= app %>
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Generated initscript for <%= app %>
-# Description:       This file starts <%= app %>. It should be placed in /etc/init.d
-### END INIT INFO
-
-# Auto generated by Buildable
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Runs <%= app %>"
-NAME=<%= app %>
-PIDDIR=/var/run/$NAME
-SCRIPTNAME=/etc/init.d/$NAME
-USERNAME=<%= user %>
-<% engine.environment.each_pair do |var,env| %>export <%= var.upcase %>=<%= env %>
-<% end %>
-
-[ -r /lib/lsb/init-functions ] &&. /lib/lsb/init-functions
-
-#
-# Function that starts the service
-#
-do_start()
-{
-  mkdir -p $PIDDIR
-  # START APPLICATION: <%= app %><% engine.each_process do |name, process| %>
-  # START PROCESS: <%= name %><% 1.upto(engine.formation[name]) do |num| %>
-  # START CONCURRENT: <%= num %>
-  # Start: <%= app %>.<%= name %>.<%= num %>
-  # Create $PIDDIR/<%= name %>.<%= num %>.pid
-  su -m $USERNAME -c 'cd <%= engine.root %>; <%= process.command %> & echo $!' > $PIDDIR/<%= name %>.<%= num %>.pid
-<% end %><% end %>
-}
-
-#
-# Function that stops the service
-#
-do_stop()
-{
-  # STOP APPLICATION: <%= app %><% engine.each_process do |name, process| %>
-  # STOP PROCESS: <%= name %><% 1.upto(engine.formation[name]) do |num| %>
-  # STOP CONCURRENT: <%= num %>
-  # Stop: <%= app %>.<%= name %>.<%= num %>
-  kill `cat $PIDDIR/<%= name %>.<%= num %>.pid`
-  rm $PIDDIR/<%= name %>.<%= num %>.pid
- <% end %><% end %>
-  rmdir $PIDDIR
-}
-
-case "$1" in
-  start)
-  log_daemon_msg "Starting $DESC" "$NAME"
-  do_start
-  case "$?" in
-    0|1) log_end_msg 0 ;;
-    2) log_end_msg 1 ;;
-  esac
-  ;;
-  stop)
-  log_daemon_msg "Stopping $DESC" "$NAME"
-  do_stop
-  case "$?" in
-    0|1) log_end_msg 0 ;;
-    2) log_end_msg 1 ;;
-  esac
-  ;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart)
-  log_daemon_msg "Restarting $DESC" "$NAME"
-  do_stop
-  case "$?" in
-    0|1)
-    do_start
-    case "$?" in
-      0) log_end_msg 0 ;;
-      1) log_end_msg 1 ;; # Old process is still running
-      *) log_end_msg 1 ;; # Failed to start
-    esac
-    ;;
-    *)
-      # Failed to stop
-    log_end_msg 1
-    ;;
-  esac
-  ;;
-  *)
-  echo "Usage: $SCRIPTNAME {start|stop|status|restart}" >&2
-  exit 3
-  ;;
-esac