forj 1.0.1 → 1.0.2

data/lib/ssh.rb

@@ -15,36 +15,97 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
+#~ require 'rubygems'
+
+require 'highline/import'
+
+#~ require 'security.rb'
+#~ include SecurityGroup
 
-require 'security.rb'
-include SecurityGroup
 #
 # ssh module
 #
-module Ssh
-   def connect(name, server, oConfig)
-      # Following line to remove as soon as ssh function is implemented with forj-lib framework
-      Logging.warning("This function may not work appropriately. Currenty under development. Thank you for your understanding.")
+module Forj
+   module Ssh
+
+      def Ssh.connect(name, oConfig)
+         oForjAccount = Lorj::Account.new(oConfig)
+
+         oForjAccount.ac_load()
+
+         aProcesses = []
+
+         # Defines how to manage Maestro and forges
+         # create a maestro box. Identify a forge instance, delete it,...
+         aProcesses << File.join($LIB_PATH, 'forj', 'ForjCore.rb')
+
+         # Defines how cli will control FORJ features
+         # boot/down/ssh/...
+         aProcesses << File.join($LIB_PATH, 'forj', 'ForjCli.rb')
+
+         oCloud = Lorj::CloudCore.new(oForjAccount, oConfig[:account_name], aProcesses)
+
+         PrcLib.state("Getting information about forge '%s'" % name)
+
+         oForge = oCloud.Get(:forge, name)
+
+         if oForge[:servers].count > 0
+            if oConfig[:box_ssh]
+               box_ssh = oConfig[:box_ssh]
+
+               oServer = nil
+               regex =  Regexp.new('%s\.%s$' % [box_ssh, name])
+
+               oForge[:servers].each { |server|
+                  oName = server[:name]
+                  next if (regex =~ oName) == nil
+                  oServer = server
+                  break
+               }
+
+               if oServer != nil
+                  #Property for :forge
+                  oConfig.set(:instance_name, name)
+                  #Property for :ssh
+                  oConfig.set(:forge_server, oServer[:id])
+
+                  oCloud.Create(:ssh)
+               else
+                  PrcLib.debug("server '%s.%s' was not found" % [oConfig[:box_ssh], name] )
+                  PrcLib.high_level_msg("server '%s.%s' was not found.\n" % [oConfig[:box_ssh], name] )
+               end
 
-      msg = 'logging into %s : %s' % [name, server]
-      Logging.info(msg)
+           else
+               #Ask the user to get server(s) to create ssh connection
+               serverList = []
+               index = 0
+               sDefault = nil
+               oForge[:servers].each{ |server|
+                  serverList[index] = server[:name]
+                  sDefault = server[:name] if server[:name].include? "maestro"
+                  index = index + 1
+               }
 
-      oForjAccount = ForjAccount.new(oConfig)
+               say("Select box for ssh connection %s" % ((sDefault.nil?)? "" : "Default: " + "|%s|\n" % sDefault))
+               value = choose { | q |
+                  q.choices(*serverList)
+                  q.default = sDefault if not sDefault.nil?
+               }
 
-      oForjAccount.ac_load()
+               oServerNumber = serverList.index(value)
 
-      oKey = SecurityGroup.keypair_detect(oForjAccount.get(:keypair_name), oForjAccount.get(:keypair_path))
+               #Property for :forge
+               oConfig.set(:instance_name, name)
+               #Property for :ssh
+               oConfig.set(:forge_server, oForge[:servers][oServerNumber][:id])
 
-      update = '%s/ssh.sh -u %s' % [ $LIB_PATH, oConfig.get(:account_name)]
-      connection = '%s/ssh.sh %s %s %s' % [$LIB_PATH, name, server, File.join(oKey[:keypair_path],oKey[:private_key_name]) ]
+               oCloud.Create(:ssh)
 
-      # update the list of servers
-      Logging.debug("Executing '%s'" % update)
-      Kernel.system(update)
+            end
+         else
+            PrcLib.high_level_msg("No server(s) found for instance name '%s' \n" % name )
+         end
 
-      # connect to the server
-      Logging.debug("Executing '%s'" % connection)
-      Kernel.system(connection)
+      end
    end
 end

metadata

@@ -1,155 +1,197 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     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
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.11
+        version: 1.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.11
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
-  name: hpcloud
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 1.6.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 1.6.21
 - !ruby/object:Gem::Dependency
-  name: git
+  name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
-  name: rbx-require-relative
+  name: encryptor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.21
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.21
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
-  name: ansi
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: encryptor
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.11
 - !ruby/object:Gem::Dependency
-  name: json
+  name: lorj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: forj cli - See https://www.forj.io for documentation/information
 email:
 - forj@forj.io
@@ -158,59 +200,41 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .gitreview
+- Gemfile
+- Gemfile.lock
+- README.md
+- Rakefile
 - bin/forj
-- lib/compute.rb
-- lib/connection.rb
-- lib/network.rb
-- lib/security.rb
-- lib/defaults.yaml
-- lib/down.rb
+- forj.gemspec
+- forj/defaults.yaml
 - lib/appinit.rb
-- lib/forj-settings.rb
-- lib/repositories.rb
-- lib/ssh.rb
-- lib/ssh.sh
-- lib/log.rb
-- lib/helpers.rb
-- lib/forj-config.rb
-- lib/forj-account.rb
 - lib/build_tmpl/bootstrap_build.sh
+- lib/build_tmpl/build-env.py
 - lib/build_tmpl/write-mime-multipart.py
-- lib/forj/ForjCore.rb
+- lib/cloud_test.rb
+- lib/forj-settings.rb
 - lib/forj/ForjCli.rb
+- lib/forj/ForjCore.rb
 - lib/forj/process/ForjProcess.rb
-- lib/lib-forj/lib/providers/templates/compute.rb
-- lib/lib-forj/lib/providers/templates/network.rb
-- lib/lib-forj/lib/providers/templates/core.rb
-- lib/lib-forj/lib/providers/hpcloud/security_groups.rb
-- lib/lib-forj/lib/providers/hpcloud/Hpcloud.rb
-- lib/lib-forj/lib/providers/hpcloud/compute.rb
-- lib/lib-forj/lib/providers/hpcloud/network.rb
-- lib/lib-forj/lib/core_process/global_process.rb
-- lib/lib-forj/lib/core_process/CloudProcess.rb
-- lib/lib-forj/lib/core_process/network_process.rb
-- lib/lib-forj/lib/core/definition.rb
-- lib/lib-forj/lib/core/core.rb
-- lib/lib-forj/lib/core/definition_internal.rb
-- lib/lib-forj/lib/lib-forj.rb
+- lib/ssh.rb
 - spec/boot_spec.rb
-- spec/connection_spec.rb
 - spec/down_spec.rb
 - spec/network_spec.rb
-- spec/repositories_spec.rb
 - spec/setup_spec.rb
 - spec/spec_helper.rb
 - spec/ssh_spec.rb
-- spec/forj-config_spec.rb
-- Rakefile
-- Gemfile
-- README.md
 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: []
+rdoc_options:
+- --title
+- Lorj - The Process Controllers framework system
+- --main
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -229,4 +253,10 @@ rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: forj command line
-test_files: []
+test_files:
+- spec/boot_spec.rb
+- spec/down_spec.rb
+- spec/network_spec.rb
+- spec/setup_spec.rb
+- spec/spec_helper.rb
+- spec/ssh_spec.rb

data/lib/compute.rb

@@ -1,36 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-
-require 'rubygems'
-
-#
-# compute module
-#
-module Compute
-  def delete_forge(oFC, name)
-    instances = oFC.oCompute.servers.all(:name => name)
-    iCount = 0
-    instances.each do|instance|
-      # make sure we don't delete another forge because fog filters
-      # the name in a "like syntax" way
-      Logging.debug("Removing '%s'" % [instance.id])
-      oFC.oCompute.servers.get(instance.id).destroy
-      iCount += 1
-    end
-	Logging.message("Forge: %s - %d servers removed" % [name, iCount])
-  end
-end