appfront 1.1.2 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a712eae44294a08a398a7ceecbfd86bce312d8de
-  data.tar.gz: 1f48f890d70c64b496e0770187ca1cc130515676
+  metadata.gz: 2d8fbd24675c2d2e610a25c286472775cfed2c59
+  data.tar.gz: 9b5e8bedad0c80cf1e9ee21d6fb19807360552ab
 SHA512:
-  metadata.gz: 664fb006c5a03ee49cee182f7725f067a40d884436b7bff2fae71073798095615767a4816bd698bfc8a187a12310f6b72e2061660072288cede383c89e519329
-  data.tar.gz: cfc18346fa7a3b6493e17351a20591f176c1927e791505f806b77fee106bc46354caf5e0b6a239ef2668484e493ab5ca8d4a84950ca073c2689309b27a6ca2db
+  metadata.gz: 5785e91792aa30388b42d4c50a44bc0405d90f5692fa3ded3f2061ae265beb476d70b93a11f4de2d3cfacfc37e48b6acbb4626fd291b21968fa0e026414a8e8f
+  data.tar.gz: 361f3a7566298ee5b4a04aacebff7e780f763457a66006f05e8352dd216c7954d564c2ff378624826c8bf0cbed0e64ce7cac9db2619d89ec71691544dca56a2c

data/lib/appfront/command.rb

@@ -35,7 +35,7 @@ module Appfront::Command
       exit 0
     end
 
-    act ||= 'list'
+    act ||= 'ls'
 
     begin
       klass = "Appfront::Command::#{klass.capitalize}".constantize

data/lib/appfront/command/alias.rb

@@ -16,7 +16,7 @@ class Appfront::Command::Alias < Appfront::Command::Base
   end
 
   def self.ls(*opts)
-    Appfront::Command::Deploys.list
+    Appfront::Command::Deploys.ls
   end
 
   def self.create(args, opts)

data/lib/appfront/command/clusters.rb

@@ -1,25 +1,95 @@
 class Appfront::Command::Clusters < Appfront::Command::Base
 
-  def self.list
+  def self.ls
     clusters = api.get "/clusters"
     puts '=== Clusters List:'
     clusters.each do |cl| 
       puts "Cluster #{cl['uuid']} ---> Name: #{cl['name']} \tProvider: #{cl['provider']}"
     end
+    print "\n"
+  end
+
+  def self.ps(args, opts)
+    exit 1 unless args[0]
+    uuid = args[0]
+    
+    puts "=== Cluster #{uuid} TOP: \n"
+    data = api.get "/cluster/#{uuid}/top"
+
+    unless data == {}
+      data.each do |b|
+        puts "\t ---"
+        puts "\t Box: #{b['address']}\t started: #{b['started']} \t memory: #{b['free_memory']}/#{b['memory']} MB"
+        puts "\n"
+        deploys = b['deploys']
+        deploys.each do |d|
+          puts "\t === #{d['deploy']} \t\t started: vuoto \t memory: #{d['memory']} MB \t cpu_usage: #{d['cpu']}%"
+        end
+        puts "\n"
+      end
+    end
+    puts "\n"
+    
+  end
+
+  def self.top(args, opts)
+    exit 1 unless args[0]
+    uuid = args[0]
+
+    begin
+    system("clear")
+    
+    puts "=== Cluster #{uuid} TOP: \n"
+    data = api.get "/cluster/#{uuid}/top"
+
+    unless data == {}
+      data.each do |b|
+        puts "\t ---"
+        puts "\t Box: #{b['address']}\t started: #{b['started']} \t memory: #{b['free_memory']}/#{b['memory']} MB"
+        puts "\n"
+        deploys = b['deploys']
+        deploys.each do |d|
+          puts "\t === #{d['deploy']} \t\t started: vuoto \t memory: #{d['memory']} MB \t cpu_usage: #{d['cpu']}%"
+        end
+        puts "\n"
+      end
+    end
+    puts "\n"
+      
+    sleep 2
+    end while true
+  rescue Exception
+    system("clear")
   end
 
   def self.info(args, opts)
     exit 1 unless args[0]
     uuid = args[0]
-    exit 1 unless opts[:provider]
-    exit 1 unless opts[:provider] == 'amazon' or opts[:provider] == 'digitalocean' or opts[:provider] == 'manual'
+    #exit 1 unless opts[:provider]
+    #exit 1 unless opts[:provider] == 'amazon' or opts[:provider] == 'digitalocean' or opts[:provider] == 'manual'
+
     c = api.get "/cluster/#{uuid}"
     puts "=== Cluster #{uuid}: \n"
     puts "\t === Name: #{c['name']}\n"
+    puts "\t === DNS Name: #{c['dns']}\n"
     puts "\t === Token: #{c['token']}\n"
     puts "\t === Region: #{c['region']}\n"
+    puts "\n"
     puts "\t === Active Boxes: #{c['boxes']}\n"
+    if c['addresses']
+      c['addresses'].each do |box|
+        puts "\t box address:\t#{box}"
+      end
+    end
     puts "\n"
+    if c['started']
+      puts "\t === Booting Boxes: #{c['started'].count}\n"
+      c['started'].each do |box|
+        puts "\t box address:\t#{box}"
+      end
+    end
+    puts "\n"
+
   end
 
   def self.create(args, opts)
@@ -71,8 +141,8 @@ class Appfront::Command::Clusters < Appfront::Command::Base
   def self.scale_up(args, opts)
     exit 1 unless args[0]
     uuid = args[0]
-    exit 1 unless opts[:provider]
-    exit 1 unless opts[:provider] == 'amazon' or opts[:provider] == 'digitalocean'
+    #exit 1 unless opts[:provider]
+    #exit 1 unless opts[:provider] == 'amazon' or opts[:provider] == 'digitalocean'
 
     spinner "Scaling UP cluster #{uuid}..." do
       api.put "/provider/cluster/#{uuid}/scale/up"
@@ -84,9 +154,8 @@ class Appfront::Command::Clusters < Appfront::Command::Base
   def self.scale_down(args, opts)
     uuid = args[0]
     exit 1 unless args[0]
-    exit 1 unless opts[:provider]
-    exit 1 unless opts[:provider] == 'amazon' or opts[:provider] == 'digitalocean'
-    exit 1 unless args[0]
+    #exit 1 unless opts[:provider]
+    #exit 1 unless opts[:provider] == 'amazon' or opts[:provider] == 'digitalocean'
 
     spinner "Scaling DOWN cluster #{uuid}..." do
       api.put "/provider/cluster/#{uuid}/scale/down"

data/lib/appfront/command/deploys.rb

@@ -10,6 +10,14 @@ class Appfront::Command::Deploys < Appfront::Command::Base
     print "\n"
   end
 
+  def self.attach(args, opts)
+    find_deploy! opts
+    spinner "Attaching deploy to cluster..." do
+      api.post "/cluster/#{args[0]}/attach", deploy: @deploy
+    end
+    puts "\n"
+  end
+
   def self.add(args, opts)
     spinner "Uploading Deploy YAML configuration to Jarvis..." do
       api.post "/flow.yaml", file: args[0]
@@ -51,11 +59,13 @@ class Appfront::Command::Deploys < Appfront::Command::Base
       end
     end
 
-    puts
-    puts "=== Cluster: "
-    puts "\t name: #{h['cluster_name']}"
-    puts "\t uuid: #{h['cluster']}"
-    puts "\t dns address:\t#{h['cluster_dns']}"
+    if h['cluster']
+      puts
+      puts "=== Cluster: "
+      puts "\t name: #{h['cluster_name']}"
+      puts "\t uuid: #{h['cluster']}"
+      puts "\t dns address:\t#{h['cluster_dns']}"
+    end
 
     if h['boxes']
       h['boxes'].each do |box|
@@ -77,7 +87,7 @@ class Appfront::Command::Deploys < Appfront::Command::Base
 
   end
 
-  def self.list
+  def self.ls
     deploys = api.get "/flows"
     unless deploys.count == 0
       puts '=== Deploys List'

data/lib/appfront/command/domains.rb

@@ -36,7 +36,7 @@ class Appfront::Command::Domains < Appfront::Command::Base
 
   end
 
-  def self.list
+  def self.ls
     domains = api.get "/domains"
     unless domains.count == 0
       puts '=== Domains List'

data/lib/appfront/command/help.rb

@@ -20,10 +20,10 @@ Additional topics:
     puts <<-HELP
 Deploys commands:
 
-  deploys:create [NAME]      # create a new deploy
-  deploys:destroy            # permanently destroy an deploy
-  deploys:info               # show detailed deploy information
-  deploys:list               # show deploys list
+  deploys:destroy -d [deploy uuid]                     # permanently destroy an deploy
+  deploys:info    -d [deploy uuid]                     # show detailed deploy information
+  deploys:list                                         # show deploys list
+  deploys:attach  -d [deploy uuid]  [cluster uuid]     # attach cluster to a deploy
     HELP
   end
 
@@ -32,9 +32,9 @@ Deploys commands:
 Clusters commands:
 
   clusters:create -p [provider] [NAME] [type] [region]    # create a new cluster
-  clusters:rm                                             # permanently destroy a cluster
-  clusters:info                                           # show detailed cluster information
-  clusters:list                                           # show clusters list
+  clusters:rm        [cluster uuid]                       # permanently destroy a cluster
+  clusters:info      [cluster uuid]                       # show detailed cluster information
+  clusters:list      [cluster uuid]                       # show clusters list
     HELP
   end
 

data/lib/appfront/command/logs.rb

@@ -10,6 +10,9 @@ class Appfront::Command::Logs < Appfront::Command::Base
       events.each {|e| puts e }
       sleep 2
     end while opts[:follow]
+
+  rescue Exception
+    system("clear")
   end
 
 end

data/lib/appfront/command/ps.rb

@@ -42,20 +42,6 @@ class Appfront::Command::Ps < Appfront::Command::Base
     puts "\n"
   end
 
-  def self.run(args, opts)
-    find_deploy! opts
-    api.put "/flow/#{@deploy}/run"
-
-    spinner "Running Deploy..." do
-      loop do
-        sleep 3
-        info = api.get "/flow/#{@deploy}"
-        break if info['status'] == 'running'
-      end
-    end
-    puts "\n"
-  end
-
   def self.scale_up(opts)
     find_deploy! opts
 
@@ -90,20 +76,17 @@ class Appfront::Command::Ps < Appfront::Command::Base
       exit 1
     end
 
-    params[:scaling] = mode if mode
-    params[:instances]    = count
-
-    api.put "/flows/#{@deploy}/scaling", params
+    api.put "/flow/#{@deploy}/scale", instances: count
 
     spinner "Scaling deploy instances..." do
       loop do
         sleep 3
         info = api.get "/flow/#{@deploy}"
-        break if info['status'] == 'running'
+        break if info['status'] == 'running' or info['status'] == 'new' or info['status'] == 'pending_recovery'
       end
     end
 
-    puts "Now running N instances"
+    puts "Now deploying #{count} instances"
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appfront
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.5
 platform: ruby
 authors:
 - Appfront
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
@@ -38,20 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.4.2
 description: Appfront Command Line Tool
 email: hello@appfront.io
 executables: