buildable 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a0e645a17e9a96827384ac30a56b6c241f34279
-  data.tar.gz: 982b1988da7fd81cd03d8c9e0f208edcfcf2aa9f
+  metadata.gz: 4f2bd089d0ff417e7516948c378f34ecab4fb7fa
+  data.tar.gz: 272c50fbf47584957018561b13307b6b76d26727
 SHA512:
-  metadata.gz: 4d7a311b1b57f07a4139e29292f4be258c9e7996149a1f4134537d2ef36552659871837fe1dc139750a2b0436d4837e9f6fa634e0ea939f6b9e6ce75463cbcdb
-  data.tar.gz: 04d193f18d0c58a2d796cd844f454f4b9cc37839d1a57bbc01d180319ecf7d84bc2112038793f90e429ae763dcf9ea4c597333cba6bf8e4583d32ee137de605c
+  metadata.gz: a1044c1158517929cb27e74434adfd3b08e82501cd348ad789953c48f03e7903a2a8b6ff19f6e6cf166d53423fe3987fb8dccd1ed7db6854993152fe3f2fcdb4
+  data.tar.gz: 0b39d0cac6eaf7ea0ed1c09a781d3bf827233cdc5eddf5368776ee2dac2d5a055010c02d6816c77da3b1c5f4373f5b46676c2081f08e8f2838304360e08015bb

data/README.md

@@ -45,6 +45,12 @@ Para gerar o pacote basta executar o seguinte comando:
   $ buildable build
 ```
 
+Quando o projeto não for um serviço, é possível desabilitar a criação do script de inicialização executando:
+
+```shell
+  $ buildable build --no-init
+```
+
 ### Via rake
 
 Para utilizar o _Buildable_ com o rake é necessário inluir o require no Rakefile
@@ -67,6 +73,12 @@ Para gerar o pacote basta executar
   $ bundle exec rake buildable:build
 ```
 
+e para gerar o pacote sem script de inicialização
+
+```shell
+  $ bundle exec rake buildable:build -- --no-init
+```
+
 _Para uma lista completa das tasks execute rake -D_
 
 

data/bin/buildable

@@ -1,7 +1,7 @@
 #!/bin/env ruby
 require 'buildable'
 
-case ARGV.join(' ')
+case ARGV.first
 when 'init'
   Buildable.init
 when 'build'

data/buildable.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'buildable/version'
+VERSION = `git describe --abbrev=0`
 
 Gem::Specification.new do |spec|
   spec.name          = "buildable"
-  spec.version       = Buildable::VERSION
+  spec.version       = `git describe --abbrev=0`
   spec.authors       = ["Alexandre Prates"]
   spec.email         = ["ajfprates@gmail.com"]
   spec.summary       = %q{Gem para criação de pacotes deb}

data/lib/buildable.rb

@@ -6,7 +6,6 @@ module Buildable
   require_relative 'buildable/shell'
   require_relative 'buildable/file_maker'
   require_relative 'buildable/recipe'
-  require_relative 'buildable/version'
 
   include ::Configureasy
   load_config '.buildable', as: 'config', path: '.'
@@ -27,7 +26,7 @@ module Buildable
     Recipe[:create_path]
     Recipe[:copy_source]
     Recipe[:vendor_gems]
-    Recipe[:make_init_script]
+    Recipe[:make_init_script] unless ARGV.include?('--no-init')
     Recipe[:make_package]
     Recipe[:remove_path]
   end
@@ -61,7 +60,12 @@ module Buildable
 
   # Make package name using Organization name (when available) with project name
   def package_name
-    [config.organization, config.project_name].compact.collect(&:underscore).join('-')
+    [self.config.organization, self.config.project_name].compact.collect(&:underscore).join('-')
+  end
+
+  # Return array with all dependencies specified in .buildable.yml
+  def dependencies
+    self.config.depends || []
   end
 
 end

data/lib/buildable/recipes/build.rb

@@ -60,19 +60,18 @@ module Buildable::Recipe
       '--prefix': '/',
       '--description': Buildable.config.description.inspect,
       '--force': nil,
-    }
+    }.compare_by_identity
 
     params['--deb-user'] = Buildable.config.app_user if Buildable.config.app_user
     params['--deb-group'] = Buildable.config.app_group if Buildable.config.app_group
 
-    if Buildable.config.respond_to? :depends
-      params.compare_by_identity
-      Buildable.config.depends.each do |package|
-        params['--depends'] = package
-      end
+    Buildable.dependencies.each do |package|
+      key = '--depends'.clone # force generate new object
+      params[key] = package
     end
 
     params['-C'] = "#{Buildable::BUILD_ROOT_DIR} ." # must be last parameter
+
     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]

data/templates/foreman/master.pill.erb

@@ -15,9 +15,11 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=<%= app %>
 USERNAME=<%= user %>
 <% engine.each_process do |name, process| -%>
-<%= name %>_pidfile=/var/run/<%= app %>_<%= name %>.pid
+<%= name %>_pidfile=/var/run/<%= app %>/<%= name %>.pid
 <% end -%>
 
+mkdir -p /var/run/<%= app %>
+
 [ -r /lib/lsb/init-functions ] &&. /lib/lsb/init-functions
 
 #
@@ -69,10 +71,10 @@ show_status()
 <% engine.each_process do |name, process| -%>
 start_<%= name %>()
 {
-  su - $USERNAME <<EOS | cut -d ' ' -f 2 > $<%= name %>_pidfile
+  su - $USERNAME <<EOS > $<%= name %>_pidfile
   cd <%= engine.root %>
   <%= engine.environment.collect { |k,v| "#{k}=#{v} " }.join %><%= process.command %> > /dev/null 2>&1 &
-  jobs -l
+  echo \$!
 EOS
   log_end_msg $?
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildable
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Alexandre Prates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -106,7 +106,6 @@ files:
 - lib/buildable/recipes/build.rb
 - lib/buildable/recipes/init.rb
 - lib/buildable/shell.rb
-- lib/buildable/version.rb
 - lib/core_ext/hash.rb
 - lib/core_ext/string.rb
 - templates/.buildable.yml.erb
@@ -135,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Gem para criação de pacotes deb

data/lib/buildable/version.rb

@@ -1,3 +0,0 @@
-module Buildable
-  VERSION = "2.2.0"
-end