forj 0.0.24 → 0.0.25

data/Gemfile

@@ -15,13 +15,15 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-source 'http;//rubygems.org'
+source 'https://rubygems.org'
 
-gem 'thor', '>=0.16.0'
-gem 'fog', '>=1.22.1'
-gem 'hpcloud', '>=2.0.6'
+gem 'mime-types','1.25.1'
+gem 'excon','0.33.0'
+gem 'json'
+gem 'nokogiri','1.5.11'
+gem 'fog', '1.19.0'
 gem 'git', '>=1.2.7'
-gem 'rbx-require-relative', '>=0.0.9'
-gem 'ruby-lint'
-gem 'rubocop'
-gem 'rspec'
+gem 'rainbow'
+gem 'rbx-require-relative', '~> 0.0.7'
+gem 'thor', '~>0.16.0'
+gem 'hpcloud', '~> 2.0.8'

data/bin/forj

@@ -15,8 +15,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'thor'
+require 'rubygems'
 require 'require_relative'
+require 'thor'
 
 require_relative '../lib/boot.rb'
 include Boot

data/lib/boot.rb

@@ -15,6 +15,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
 require 'require_relative'
 
 require_relative 'network.rb'
@@ -36,16 +37,18 @@ include Helpers
 module Boot
   def boot(blueprint, cloud_provider, name, build_config_dir, branch, test = false)
     begin
-      initial_msg = format('booting %{blueprint} on %{cloud_provider}',
-                           blueprint: blueprint , cloud_provider: cloud_provider)
+      initial_msg = 'booting %s on %s' % [blueprint , cloud_provider]
+
       Logging.info(initial_msg)
       puts (initial_msg)
 
       forj_dir = File.expand_path(File.dirname(__FILE__))
       Dir.chdir(forj_dir)
-      definitions = YamlParse.get_values('../lib/catalog.yaml')
+      definitions = YamlParse.get_values('catalog.yaml')
+
+      maestro_url =  definitions['default']['maestro']
 
-      Repositories.clone_repo
+      Repositories.clone_repo(maestro_url)
 
       network = Network.create_network(name)
       subnet = Network.create_subnet(network.id, name)
@@ -72,11 +75,11 @@ module Boot
       Dir.chdir(build_path)
 
       if build_config_dir
-        command = format('bin/build.sh --build_ID maestro.%{name} --box-name maestro --build-conf-dir %{build_config_dir} --build-config box-13.5 --gitBranch %{branch}', name: name, build_config_dir: build_config_dir, branch: branch)
+        command = 'bin/build.sh --build_ID maestro.%s --box-name maestro --build-conf-dir %s --build-config box-13.5 --gitBranch %s' % [name,build_config_dir, branch]
       elsif blueprint != 'redstone'
-        command = format('bin/build.sh --build_ID %{name} --box-name maestro --build-conf-dir ~/.forj/maestro/build/conf --build-config box --blueprint %{blueprint_name}', name: name, blueprint_name: blueprint)
+        command = 'bin/build.sh --build_ID %s --box-name maestro --build-conf-dir ~/.forj/maestro/build/conf --build-config box --blueprint %s' % [name, blueprint]
       else
-        command = format('bin/build.sh --build_ID %{name} --box-name maestro --build-conf-dir ~/.forj/maestro/build/conf --build-config box', name: name)
+        command = 'bin/build.sh --build_ID %s --box-name maestro --build-conf-dir ~/.forj/maestro/build/conf --build-config box' % [name]
       end
 
       Kernel.system(command)
@@ -90,7 +93,7 @@ module Boot
       end
 
     rescue SystemExit, Interrupt
-      msg = format('%{name} interrupted by user')
+      msg = '%s interrupted by user' % [name]
       puts msg
       Logging.info(msg)
     rescue StandardError => e

data/lib/connection.rb

@@ -15,6 +15,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
 require 'fog'
 require 'require_relative'
 
@@ -60,7 +61,7 @@ end
 
 def get_credentials
   home = File.expand_path('~')
-  creds = format('%{home}/.hpcloud/accounts/hp', home: home)
+  creds = '%s/.hpcloud/accounts/hp' % [home]
   template = YAML.load_file(creds)
   credentials = Hash.new
 
@@ -71,7 +72,7 @@ def get_credentials
     credentials['tenant_id'] = template[:credentials][:tenant_id]
     credentials['availability_zone'] = template[:regions][:compute]
   rescue => e
-    puts format('your credentials are not configured, delete the file %{creds} and run forj setup again', creds: creds)
+    puts 'your credentials are not configured, delete the file %s and run forj setup again' % [creds]
     Logging.error(e.message)
   end
   credentials

data/lib/down.rb

@@ -15,6 +15,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
 require 'require_relative'
 
 require_relative 'network.rb'
@@ -31,9 +32,9 @@ module Down
   def down(name)
     begin
 
-      puts format('deleting %{name}...', name: name)
+      puts 'deleting %s...' % [name]
 
-      definitions = YamlParse::get_values('../lib/catalog.yaml')
+      definitions = YamlParse::get_values('catalog.yaml')
 
       # get the subnet
       subnet = Network::get_subnet(name)

data/lib/log.rb

@@ -18,6 +18,7 @@
 
 # create a forj.log file in ~/.hpcloud/forj.log
 
+require 'rubygems'
 require 'logger'
 
 require 'require_relative'
@@ -31,9 +32,10 @@ include Helpers
 module Logging
   def info(message)
     home = Helpers.get_home_path
-    Helpers.create_directory(format('%{home}/.forj/', home: home))
+    d = '%s/.forj/' % [home]
+    Helpers.create_directory(d)
 
-    log = format('%{home}/.forj/forj.log', home: home)
+    log = '%s/.forj/forj.log' % [home]
     log = Logger.new(log)
     log.level = Logger::DEBUG
 
@@ -46,9 +48,10 @@ module Logging
 
   def error(message)
     home = Helpers.get_home_path
-    Helpers.create_directory(format('%{home}/.forj/', home: home))
+    d = '%s/.forj/' % [home]
+    Helpers.create_directory(d)
 
-    log = format('%{home}/.forj/forj.log', home: home)
+    log = '%s/.forj/forj.log' % [home]
     log = Logger.new(log)
     log.level = Logger::ERROR
 

data/lib/network.rb

@@ -15,6 +15,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
 require 'require_relative'
 
 require_relative 'connection.rb'
@@ -28,7 +29,8 @@ include Logging
 module Network
   def create_network(name)
     begin
-      Logging.info(format('creating network %{name}', name: name))
+      info = 'creating network %s' % [name]
+      Logging.info(info)
       Connection.network.networks.create(:name => name)
     rescue => e
       Logging.error(e.message)

data/lib/repositories.rb

@@ -15,6 +15,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
 require 'git'
 require 'fileutils'
 require 'require_relative'
@@ -28,14 +29,8 @@ include Logging
 # Repositories module
 #
 module Repositories
-  def clone_repo
-
+  def clone_repo(maestro_url)
       current_dir = Dir.pwd
-      forj_dir = File.expand_path(File.dirname(__FILE__))
-      Dir.chdir(forj_dir)
-
-      definitions = YamlParse::get_values('../lib/catalog.yaml')
-      maestro_url = definitions['default']['maestro']
 
       home = File.expand_path('~')
       path = home + '/.forj/'
@@ -49,7 +44,7 @@ module Repositories
           Git.clone(maestro_url, 'maestro', :path => path)
         end
       rescue => e
-        puts format('Error while cloning the repo from %{maestro_url}', maestro_url: maestro_url)
+        puts 'Error while cloning the repo from %s' % [maestro_url]
         puts 'If this error persist you could clone the repo manually in ~/.forj/'
         Logging.error(e.message)
       end

data/lib/security.rb

@@ -15,6 +15,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
 require 'require_relative'
 
 require_relative 'connection.rb'
@@ -34,7 +35,7 @@ module SecurityGroup
       if sec_groups.length >= 1
         sec_group = sec_groups[0]
       else
-        description = format('Security group for blueprint %{name}', name: name)
+        description = 'Security group for blueprint %s' % [name]
         Logging.info(description)
         sec_group = Connection.network.security_groups.create(
             :name => name,
@@ -67,7 +68,7 @@ module SecurityGroup
           :remote_ip_prefix => '0.0.0.0/0'
       )
     rescue StandardError => e
-      msg = format('error creating the rule for port %{port_min}', port_min: port_min)
+      msg = 'error creating the rule for port %s' % [port_min]
       puts msg
       Logging.error(e.message)
     end

data/lib/yaml_parse.rb

@@ -15,6 +15,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
 require 'yaml'
 require_relative 'log.rb'
 include Logging

data/spec/connection_spec.rb

@@ -15,6 +15,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
 require 'spec_helper'
 
 require 'fog'

data/spec/repositories_spec.rb

@@ -15,6 +15,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
 require 'spec_helper'
 
 require 'fog'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &17485920 !ruby/object:Gem::Requirement
+  requirement: &10315720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,32 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *17485920
+  version_requirements: *10315720
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &10314840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *10314840
+- !ruby/object:Gem::Dependency
+  name: LibXML
+  requirement: &10313900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *10313900
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &17484500 !ruby/object:Gem::Requirement
+  requirement: &10309980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +54,10 @@ dependencies:
         version: 1.22.1
   type: :runtime
   prerelease: false
-  version_requirements: *17484500
+  version_requirements: *10309980
 - !ruby/object:Gem::Dependency
   name: hpcloud
-  requirement: &17483240 !ruby/object:Gem::Requirement
+  requirement: &10309340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *17483240
+  version_requirements: *10309340
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &17481520 !ruby/object:Gem::Requirement
+  requirement: &10308560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *17481520
+  version_requirements: *10308560
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
-  requirement: &17470620 !ruby/object:Gem::Requirement
+  requirement: &10307680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +87,7 @@ dependencies:
         version: 0.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *17470620
+  version_requirements: *10307680
 description: forj command line
 email:
 - forj@forj.io