buildable 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f0ac55cf0dc9062e18f144c8730ba214bb3f1eb
-  data.tar.gz: 16c9c2a729693394226619b8e8f79a7efbbc0ee4
+  metadata.gz: 1eebad5c44cf79863ca232963746922ca0974ba1
+  data.tar.gz: 6a025e8b2bba447260a2ef4d748245c4e2382d17
 SHA512:
-  metadata.gz: 7a03e308cdac0b33166c3359c9ba7bcac1ddecbd64ac8d97c0bfa5b2456f8f496dd0a0533b37a41b004a3a3f6476ca917d31847d9e6b39d38b1cbb805d82a576
-  data.tar.gz: 2f812c6ca1f6ea057f8c83e94bfe5bee6498cba213b04228b56ae65bf59faeee66d0586c69c472b64a340e0875257020c83d9c21f177f38c5d481517b27eb04a
+  metadata.gz: 4dfc231b5712424a32a8357ff1d25aab593cf15426378c8e768b46cc822621dbc0e4f530d3d17ff43c5ce2efdf23d142d366f4f3b25fe9bd4751c83927eecfdb
+  data.tar.gz: 323c7fe0c85d9bc3700cf13ec1faf9492438d3c60935491cdacd9e55a09c7811edaeee002ad11649baedb9166b7d1fb3f5573d7723ae7bce839af87dce33c8ef

data/README.md

@@ -51,7 +51,6 @@ Para utilizar o _Buildable_ com o rake é necessário inluir o require no Rakefi
 
 ```ruby
 # on Rakefile
-
 begin
   require 'buildable/rake_task'
   Buildable::RakeTask.load

data/lib/buildable.rb

@@ -2,11 +2,11 @@ require 'configureasy'
 
 module Buildable
   require_relative 'core_ext/hash'
-  require_relative 'buildable/version'
+  require_relative 'core_ext/string'
   require_relative 'buildable/shell'
   require_relative 'buildable/file_maker'
   require_relative 'buildable/recipe'
-  require_relative 'buildable/rake_helper'
+  require_relative 'buildable/version'
 
   include ::Configureasy
   load_config '.buildable', as: 'config', path: '.'
@@ -59,4 +59,9 @@ module Buildable
     File.expand_path('../../templates/foreman', __FILE__)
   end
 
+  # Make package name using Organization name (when available) with project name
+  def package_name
+    [config.organization, config.project_name].compact.collect(&:underscore).join('-')
+  end
+
 end

data/lib/buildable/recipes/build.rb

@@ -53,7 +53,7 @@ module Buildable::Recipe
     params = {
       '-s' => 'dir',
       '-t' => 'deb',
-      '--name' => "r7-#{Buildable.config.project_name.downcase}",
+      '--name' => Buildable.package_name,
       '--version' => version,
       '--architecture' => 'all',
       '--package' => './pkg',

data/lib/buildable/version.rb

@@ -1,3 +1,3 @@
 module Buildable
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/lib/core_ext/string.rb

@@ -0,0 +1,11 @@
+class String
+
+  # Underscore text (downcase and replace now-char to '-')
+  #  Example:
+  #  "some_text".underscore # => "some-text"
+  #  "R7.com".underscore # => "r7-com"
+  def underscore
+    self.strip.downcase.gsub(/\W/, '-')
+  end
+
+end

data/templates/.buildable.yml.erb

@@ -1,5 +1,6 @@
 project_name: awesome_app
 description: Most awesome project in the world
+organization: organization name
 app_user: application_user
 root_dir: application_root_path
 files_to_ignore:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildable
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Alexandre Prates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,7 @@ files:
 - lib/buildable/shell.rb
 - lib/buildable/version.rb
 - lib/core_ext/hash.rb
+- lib/core_ext/string.rb
 - templates/.buildable.yml.erb
 - templates/Procfile.erb
 - templates/foreman/master.pill.erb