forj 0.0.32 → 0.0.33

data/lib/boot.rb

@@ -130,7 +130,7 @@ module Boot
 
       box_name = definitions['default']['box_name'] unless box_name
 
-      meta = '--meta blueprint=%s' % [blueprint]
+      meta = '--meta blueprint=%s  --meta HPCLOUD_PRIV=~/.cache/forj/master.forj-13.5.g64' % [blueprint]
 
       command = '%s --build_ID %s --box-name %s --build-conf-dir %s --build-config %s --gitBranch %s --debug-box %s' % [build, name, box_name, infra_dir, build_config, branch, meta]
 

data/lib/setup.rb

@@ -36,17 +36,16 @@ module Setup
 end
 
 def setup_credentials
-  puts 'Enter hpcloud username: '
   hpcloud_os_user = ask('Enter hpcloud username: ')
   hpcloud_os_key = ask('Enter hpcloud password: ') { |q| q.echo = '*'}
 
   home = File.expand_path('~')
   creds = '%s/.cache/forj/creds' % [home]
-  File.open(creds, 'w') {|file|
-    file.write('HPCLOUD_OS_USER=%s' % [hpcloud_os_user])
-    file.write("\n")
-    file.write('HPCLOUD_OS_KEY=%s' % [hpcloud_os_key])
-  }
+
+  values = {:credentials => {:hpcloud_os_user=> hpcloud_os_user, :hpcloud_os_key=> hpcloud_os_key}}
+
+  YamlParse.dump_values(values, creds)
+
 end
 
 
@@ -64,13 +63,16 @@ def save_cloud_fog
   access_key = template[:credentials][:account_id]
   secret_key = template[:credentials][:secret_key]
 
-  os_user = local_template['HPCLOUD_OS_USER']
-  os_key = local_template['HPCLOUD_OS_KEY']
+  os_user = local_template[:credentials][:hpcloud_os_user]
+  os_key = local_template[:credentials][:hpcloud_os_key]
 
   File.open(cloud_fog, 'w') {|file|
     file.write('HPCLOUD_OS_USER=%s' % [os_user])
+    file.write("\n")
     file.write('HPCLOUD_OS_KEY=%s' % [os_key])
+    file.write("\n")
     file.write('DNS_KEY=%s' % [access_key])
+    file.write("\n")
     file.write('DNS_SECRET=%s' % [secret_key])
   }
 

data/lib/yaml_parse.rb

@@ -32,4 +32,14 @@ module YamlParse
       Logging.error(e.message)
     end
   end
+
+  def dump_values(string, path)
+    begin
+      File.open(path, 'w') do |out|
+        YAML.dump(string, out)
+      end
+    rescue => e
+      Logging.error(e.message)
+    end
+  end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
+  prerelease: 
 platform: ruby
 authors:
 - forj team
@@ -12,102 +13,81 @@ date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16777300 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.16.0
+  version_requirements: *16777300
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16776760 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.11
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.11
+  version_requirements: *16776760
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16776080 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.19.0
+  version_requirements: *16776080
 - !ruby/object:Gem::Dependency
   name: hpcloud
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16775160 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.8
+  version_requirements: *16775160
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16773180 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.7
+  version_requirements: *16773180
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16771380 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.7
+  version_requirements: *16771380
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16786340 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.21
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.21
+  version_requirements: *16786340
 description: forj command line
 email:
 - forj@forj.io
@@ -147,25 +127,26 @@ files:
 homepage: https://forj.io
 licenses:
 - Apache License, Version 2.0.
-metadata: {}
 post_install_message: Go to docs.forj.io for more information on how to use forj cli
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.5
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: forj command line
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9b005cfdf0378f6542960384a955b0178b6fba87
-  data.tar.gz: 36c3649b97b76407bec1ea5abcc7a56b56df89df
-SHA512:
-  metadata.gz: c04216e0b8ebf47678739a6d926ad00e30160d53648432cb2bf9c175da4b5bc90e86ca0e8f48d906248ea8a8f89a1f4c29e9840b6bba56038d377d519b67556a
-  data.tar.gz: 092c8482f8bd958e6fbdbbe12b39866755b43a600895e00b15301ca5925385b9da9e697f8431a31e004f251af8326306d6a5ddc9e48a0ce250dd69ccb1efd398