forj 0.0.11 → 0.0.12

data/bin/forj

@@ -15,6 +15,7 @@
 #    limitations under the License.
 
 require 'thor'
+require 'require_relative'
 
 require_relative '../lib/boot.rb'
 include Boot

data/lib/boot.rb

@@ -14,6 +14,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'require_relative'
+
 require_relative 'compute.rb'
 include Compute
 require_relative 'network.rb'
@@ -55,10 +57,6 @@ module Boot
       Network.create_security_group_rule(security_group.id, 'tcp', port, port)
     end
 
-    # get image and flavor
-    image = Compute.get_image(definitions[blueprint]['image'])
-    flavor = Compute.get_flavor(definitions[blueprint]['flavor'])
-
     # run build.sh to boot maestro
     current_dir = Dir.pwd
     home = File.expand_path('~')

data/lib/compute.rb

@@ -14,8 +14,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'net/http'
-require 'open-uri'
+require 'require_relative'
 
 require_relative 'connection.rb'
 include Connection
@@ -50,20 +49,6 @@ module Compute
     flavor
   end
 
-  def create_instance(name, flavor_id, image_id, key_name, security_groups, availability_zone, networks)
-    server = Connection.compute.servers.create(
-        :name                 => name,
-        :flavor_id            => flavor_id,
-        :image_id             => image_id,
-        :key_name             => key_name,
-        :security_groups      => [security_groups],
-        :availability_zone    => availability_zone,
-        :networks             => [networks],
-        :metadata             => { :Meta1 => 'MetaValue1'},
-        :config_drive         => true
-    )
-  end
-
   def delete_instance(maestro)
     result = Connection.compute.servers.all(:name => maestro)[0]
     name = result.name

data/lib/connection.rb

@@ -15,6 +15,7 @@
 #    limitations under the License.
 
 require 'fog'
+require 'require_relative'
 
 require_relative 'yaml_parse.rb'
 include YamlParse

data/lib/down.rb

@@ -14,6 +14,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'require_relative'
+
 require_relative 'compute.rb'
 include Compute
 require_relative 'network.rb'

data/lib/network.rb

@@ -14,6 +14,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'require_relative'
+
 require_relative 'connection.rb'
 include Connection
 

data/lib/repositories.rb

@@ -15,6 +15,8 @@
 #    limitations under the License.
 
 require 'git'
+require 'fileutils'
+require 'require_relative'
 
 require_relative 'yaml_parse.rb'
 include YamlParse
@@ -29,9 +31,11 @@ module Repositories
     path = home + '/.hpcloud/'
 
     begin
-      unless File.directory?(path) do
-          Git.clone(maestro_url, 'maestro', :path => path)
+      if File.directory?(path)
+        if File.directory?(path + 'maestro')
+          FileUtils.rm_r path + 'maestro'
         end
+        Git.clone(maestro_url, 'maestro', :path => path)
       end
     rescue
       puts 'Error while cloning the repo from %s' % [maestro_url]

data/lib/security.rb

@@ -14,6 +14,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'require_relative'
+
 require_relative 'connection.rb'
 include Connection
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   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: &21936120 !ruby/object:Gem::Requirement
+  requirement: &15444700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.19.1
   type: :runtime
   prerelease: false
-  version_requirements: *21936120
+  version_requirements: *15444700
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &21935120 !ruby/object:Gem::Requirement
+  requirement: &15443140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,40 @@ dependencies:
         version: 1.22.1
   type: :runtime
   prerelease: false
-  version_requirements: *21935120
+  version_requirements: *15443140
+- !ruby/object:Gem::Dependency
+  name: hpcloud
+  requirement: &15441140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *15441140
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: &15439500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *15439500
+- !ruby/object:Gem::Dependency
+  name: rbx-require-relative
+  requirement: &15438780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: *15438780
 description: forj command line
 email:
 - forj@forj.io