buildable 2.1.6 → 2.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjBlNjc1ZTlmNGVjNGVhMGZlZmNhZmJiOWNkZjdmMjdlZWQ3ZjE0Ng==
-  data.tar.gz: !binary |-
-    MDg4ZTU4NWJmMzg2ODQ1ZDExNTVkZTM4MDFlNTc0MTM4MzQ4ODg2Yw==
+SHA1:
+  metadata.gz: 1a0e645a17e9a96827384ac30a56b6c241f34279
+  data.tar.gz: 982b1988da7fd81cd03d8c9e0f208edcfcf2aa9f
 SHA512:
-  metadata.gz: !binary |-
-    OGU0ZGJmNzQzOTMyYjJlOWQwMTk0OThjNTViZThlMmE3MzhlNzY3Yzc4NTM5
-    OGVjZWI5OGJmOTNiNTI4NGJhZDBkMGJjODIzMjMwYjFiMWM1NWNmYzQ5ZTA3
-    NDUwMjNiNTg1ZTJkZjU3MTc2NDk2MzdjMGJiZjEyY2M4Y2U3MGI=
-  data.tar.gz: !binary |-
-    ZTliN2ZjNmU4OTFlMzVhZGYzYmI2ODU0MjBhNjA3OGUwZThmNWY4NGExYzA5
-    Mjg5MGZiZjQ0NjU4NzFlMTJlZjI1YzBjMjc0MTEzNWE4NTAzYzdlMDhjNzZm
-    NWU3YTUwYmY0ODc2YWQ1NzQyMjQ4ZGEyYjExZTFmYTc0MjBiZTE=
+  metadata.gz: 4d7a311b1b57f07a4139e29292f4be258c9e7996149a1f4134537d2ef36552659871837fe1dc139750a2b0436d4837e9f6fa634e0ea939f6b9e6ce75463cbcdb
+  data.tar.gz: 04d193f18d0c58a2d796cd844f454f4b9cc37839d1a57bbc01d180319ecf7d84bc2112038793f90e429ae763dcf9ea4c597333cba6bf8e4583d32ee137de605c

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)
-VERSION = `git describe --abbrev=0`
+require 'buildable/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "buildable"
-  spec.version       = `git describe --abbrev=0`
+  spec.version       = Buildable::VERSION
   spec.authors       = ["Alexandre Prates"]
   spec.email         = ["ajfprates@gmail.com"]
   spec.summary       = %q{Gem para criação de pacotes deb}

data/lib/buildable.rb

@@ -6,6 +6,7 @@ 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: '.'
@@ -60,12 +61,7 @@ module Buildable
 
   # Make package name using Organization name (when available) with project name
   def package_name
-    [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 || []
+    [config.organization, config.project_name].compact.collect(&:underscore).join('-')
   end
 
 end

data/lib/buildable/recipes/build.rb

@@ -60,18 +60,19 @@ 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
 
-    Buildable.dependencies.each do |package|
-      key = '--depends'.clone # force generate new object
-      params[key] = package
+    if Buildable.config.respond_to? :depends
+      params.compare_by_identity
+      Buildable.config.depends.each do |package|
+        params['--depends'] = package
+      end
     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/lib/buildable/version.rb

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

data/templates/foreman/master.pill.erb

@@ -15,7 +15,7 @@ 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 -%>
 
 [ -r /lib/lsb/init-functions ] &&. /lib/lsb/init-functions
@@ -69,10 +69,10 @@ show_status()
 <% engine.each_process do |name, process| -%>
 start_<%= name %>()
 {
-  su - $USERNAME <<EOS > $<%= name %>_pidfile
+  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 &
-  echo \$!
+  jobs -l
 EOS
   log_end_msg $?
 }

metadata

@@ -1,87 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: buildable
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.0
 platform: ruby
 authors:
 - Alexandre Prates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2016-10-25 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'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.78.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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: Gem para criação de pacotes deb para distribuição de seus projetos em
@@ -93,7 +93,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -106,6 +106,7 @@ 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
@@ -124,17 +125,17 @@ 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.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Gem para criação de pacotes deb