forj 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 502bfc6edeb25b5ff031e55b707cb8c27800dcea
-  data.tar.gz: a58602925d8e68d05907eb3834d959e46b080bf1
+  metadata.gz: bce94bcc25e62cfda68553083ab01c6f9dddd210
+  data.tar.gz: 6f98bdd389ac9e930225075145e2aeac9680b280
 SHA512:
-  metadata.gz: f6112e2d51cf46da0c29b44be1221135c8cff7b6cb631725c4c3bbc8204242b61f107865673cfa7ca8f242ffb136ad8a0af9079df0548b404ac7b06be96c42f0
-  data.tar.gz: 895f7bc30b598051e49612b21b54a3ded559dd06556a3475b131367ada6490c7da02604c53f9a20228fbcb078a85aae1b0f61734bdfb20a0bbe170ee7da0c0b1
+  metadata.gz: 10cf1c72bc894a6db47de88fbeead1f64a5d429f26fc8e6f69f382e5ffc4377d2d7c86976768a4dfb9262a04c5c7861a87c2078c43c4b2222fbf7af32e312406
+  data.tar.gz: 40272628a7797e2eccaa90daba1b57e81049db3f1381ce1bd7dc84395d6d460d06d23f0f4d1861fe98fbb40781c932137226840cb78f3dff90f46e79b89530fb

data/bin/forj

@@ -27,7 +27,8 @@ LIB_PATH = File.expand_path(File.join(APP_PATH, 'lib'))
 
 require 'lorj'
 PrcLib.app_name = 'forj'
-PrcLib.app_defaults = File.join(APP_PATH, 'forj')
+PrcLib.app_defaults = File.join(APP_PATH, PrcLib.app_name)
+PrcLib.pdata_path = File.expand_path(File.join('~', '.cache', PrcLib.app_name))
 
 # Initialize forj paths
 require 'appinit.rb' # Load Application settings features
@@ -146,6 +147,8 @@ If you want to check/updated them, use `forj get [-a account]`
     ' ~/src/forj-oss/maestro build.sh and' \
     "\n                                            " \
     'test-box will send your local maestro repo to your box, for boot.'
+  method_option :extra_metadata,   :aliases => '-e',   :desc => 'Custom' \
+    ' server metadata format key1=value1,key2=value2...,keyN=valueN'
 
   def boot(blueprint, on_or_name, old_accountname = nil, as = nil,
            old_name = nil)

data/forj.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.name        = 'forj'
   s.homepage = 'https://www.forj.io'
 
-  s.version     = '1.0.4'
-  s.date        = '2015-02-10'
+  s.version     = '1.0.5'
+  s.date        = '2015-02-11'
   s.summary     = 'forj command line'
   s.description = 'forj cli - See https://www.forj.io for documentation/information'
 

data/lib/boot.rb

@@ -122,7 +122,8 @@ module Forj
                       :security_group => :security_group,
                       :image_name => :image_name, :maestro_flavor => :flavor,
                       :bp_flavor => :bp_flavor, :maestro_repo => :maestro_repo,
-                      :branch => :branch, :test_box => :test_box }
+                      :branch => :branch, :test_box => :test_box,
+                      :extra_metadata => :extra_metadata }
 
       load_options(options, options_map) do |key, value|
         case key

data/lib/forj/ForjCore.rb

@@ -78,6 +78,8 @@ class Lorj::BaseDefinition
   obj_needs :data,   :bootstrap
   # Add init additional git clone steps.
   obj_needs :data,   :repos
+  # Add extra metadata
+  obj_needs :data,   :extra_metadata
 
   # ******************* userdata object
   define_obj :userdata,

data/lib/forj/process/ForjProcess.rb

@@ -489,6 +489,14 @@ class ForjCoreProcess
     h_meta['repos'] = hParams[:repos] if hParams[:repos]
     # Add init bootstrap additionnal steps
     h_meta['bootstrap'] = hParams[:bootstrap] if hParams[:bootstrap]
+
+    if hParams[:extra_metadata]
+      hParams[:extra_metadata].split(/,/).each do |kv|
+        k, v = kv.split(/=/)
+        h_meta[k] = v
+      end
+    end
+
     h_meta
   end
 
@@ -644,6 +652,7 @@ class ForjCoreProcess
   def infra_is_original?(infra_dir, maestro_dir)
     dest_cloud_init = File.join(infra_dir, 'cloud-init')
     template = File.join(maestro_dir, 'templates', 'infra')
+    return false unless File.exist?(template)
     s_md5_list = File.join(infra_dir, '.maestro_original.yaml')
     b_result = true
     h_result = {}
@@ -1284,10 +1293,4 @@ class ForjCoreProcess
     PrcLib.debug("Running '%s'", command)
     system(command)
   end
-
-  def ssh_user(image_name)
-    return 'fedora' if image_name =~ /fedora/i
-    return 'centos' if image_name =~ /centos/i
-    'ubuntu'
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor