scalarium 0.4.1 → 0.4.2

data/lib/scalarium/cli.rb

@@ -81,8 +81,10 @@ class Scalarium
         while(instance = instances.shift) do
           system(%{tmux split-window -h -p #{100/total_instances*(instances.size+1)} -t #{session_name} "ssh -t #{instance.nickname} \\"#{command}\\""})
         end
-        system("tmux select-window -t #{session_name}")
-        exec("tmux -2 attach-session -t #{session_name}")
+        system("tmux select-window -t #{session_name} ")
+        system("tmux select-layout -t #{session_name} tiled")
+        exec("tmux -2 attach-session -t #{session_name} ")
+
       end
     end
 
@@ -98,12 +100,12 @@ class Scalarium
 
           puts "Waiting the deploy finish"
           puts "Check https://manage.scalarium.com/clouds/#{cloud.id}/deployments/#{deploy_info["id"]} if you want"
-          while deploy_info["successful"] == nil
+          while deploy_info["status"] == 'running'
             sleep 1
             deploy_info = cloud.check_deploy(deploy_info["id"])
           end
-          puts "Deploy was #{deploy_info["successful"]}"
-          exit (deploy_info["successful"] ? 0 : -1)
+          puts "Deploy was #{deploy_info["status"]}"
+          exit (deploy_info["status"] == 'successful' ? 0 : -1)
         end
       end
     end
@@ -127,12 +129,12 @@ class Scalarium
 
           puts "Waiting the recipe to finish"
           puts "Check https://manage.scalarium.com/clouds/#{cloud.id}/deployments/#{deploy_info["id"]} if you want"
-          while deploy_info["successful"] == nil
+          while deploy_info["status"] == 'running'
             sleep 1
             deploy_info = cloud.check_deploy(deploy_info["id"])
           end
-          puts "Deploy was #{deploy_info["successful"]}"
-          exit (deploy_info["successful"] ? 0 : -1)
+          puts "Deploy was #{deploy_info["status"]}"
+          exit (deploy_info["status"] == 'successful' ? 0 : -1)
         end
       end
     end
@@ -146,12 +148,12 @@ class Scalarium
 
         puts "Waiting the deploy finish"
         puts "Check https://manage.scalarium.com/applications/#{app.id}/deployments/#{deploy_info["id"]} if you want"
-        while deploy_info["successful"] == nil
+        while deploy_info["status"] == 'running'
           sleep 1
           deploy_info = app.deploy_info(deploy_info["id"])
         end
-        puts "Deploy was #{deploy_info["successful"]}"
-        exit (deploy_info["successful"] ? 0 : -1)
+        puts "Deploy was #{deploy_info["status"]}"
+        exit (deploy_info["status"] == 'successful' ? 0 : -1)
       end
     end
 
@@ -176,7 +178,9 @@ class Scalarium
         clouds.threaded_each{ |c|
           if cloud_name != 'all'
             DQ[ lambda{ c.instances }, lambda{c.roles} ]
-            print_cloud(c, options[:verbose])
+            Thread.exclusive do
+              print_cloud(c, options[:verbose])
+            end
           else
             puts c.name
           end

data/lib/scalarium/version.rb

@@ -1,3 +1,3 @@
 class Scalarium
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/scalarium.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rest-client'
 	s.add_runtime_dependency 'dispatch_queue', ">=1.1.0"
   s.add_runtime_dependency 'thor'
+  s.add_runtime_dependency 'net-ssh'
   s.add_development_dependency 'ruby-debug19'
   s.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scalarium
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000Z
+date: 2012-07-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2164424560 !ruby/object:Gem::Requirement
+  requirement: &70196225605140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164424560
+  version_requirements: *70196225605140
 - !ruby/object:Gem::Dependency
   name: dispatch_queue
-  requirement: &2164423860 !ruby/object:Gem::Requirement
+  requirement: &70196225604640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164423860
+  version_requirements: *70196225604640
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2164423280 !ruby/object:Gem::Requirement
+  requirement: &70196225604220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164423280
+  version_requirements: *70196225604220
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: &70196225603760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70196225603760
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2164422660 !ruby/object:Gem::Requirement
+  requirement: &70196225603340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164422660
+  version_requirements: *70196225603340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164422160 !ruby/object:Gem::Requirement
+  requirement: &70196225602920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164422160
+  version_requirements: *70196225602920
 description: Access your scalarium clouds from console
 email:
 - guillermo@cientifico.net
@@ -110,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scalarium
-rubygems_version: 1.8.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Scalarium console access