vmc 0.4.0.beta.93 → 0.4.0.beta.94

data/vmc-ng/Rakefile

@@ -6,43 +6,34 @@ require "vmc/version"
 task :default => :spec
 
 desc "Run specs"
-task :spec => ["bundler:install", "test:spec"]
-
-desc "Run integration tests"
-task :test => ["bundler:install", "test:integration"]
-
-task :build do
-  sh "gem build vmc.gemspec"
-end
-
-task :install => :build do
-  sh "gem install --local vmc-#{VMC::VERSION}"
-  sh "rm vmc-#{VMC::VERSION}.gem"
-end
-
-task :uninstall do
-  sh "gem uninstall vmc"
+task :spec => "bundler:install" do
+  sh("rspec")
 end
 
-task :reinstall => [:uninstall, :install]
-
-task :release => :build do
-  sh "gem push vmc-#{VMC::VERSION}.gem"
-end
-
-namespace "bundler" do
-  desc "Install gems"
+namespace :bundler do
+  desc "Install bundler and gems"
   task "install" do
-    sh("bundle install")
+    sh("(gem list --local bundler | grep bundler || gem install bundler) && (bundle check || bundle install)")
   end
 end
 
-namespace "test" do
-  task "spec" do |t|
-    # nothing
+namespace :gem do
+  desc "Build Gem"
+  task :build do
+    sh "gem build vmc.gemspec"
   end
 
-  task "integration" do |t|
-    sh("cd spec && bundle exec rake spec")
+  desc "Install Gem"
+  task :install => :build do
+    sh "gem install --local vmc-#{VMC::VERSION}"
+    sh "rm vmc-#{VMC::VERSION}.gem"
   end
+
+  desc "Uninstall Gem"
+  task :uninstall do
+    sh "gem uninstall vmc"
+  end
+
+  desc "Reinstall Gem"
+  task :reinstall => [:uninstall, :install]
 end

data/vmc-ng/lib/vmc.rb

@@ -2,10 +2,11 @@ require "vmc/version"
 
 require "vmc/cli"
 require "vmc/cli/start"
-require "vmc/cli/app"
 require "vmc/cli/service"
 require "vmc/cli/user"
 require "vmc/cli/space"
 require "vmc/cli/organization"
-require "vmc/cli/route"
-require "vmc/cli/domain"
+
+Dir[File.expand_path("../vmc/cli/{app,route,domain}/*.rb", __FILE__)].each do |file|
+  require file unless File.basename(file) == 'base.rb'
+end

data/vmc-ng/lib/vmc/cli.rb

@@ -2,10 +2,9 @@ require "yaml"
 require "socket"
 require "net/http"
 require "multi_json"
+require "fileutils"
 
 require "mothership"
-require "mothership/pretty"
-require "mothership/progress"
 
 require "cfoundry"
 
@@ -23,8 +22,6 @@ module VMC
   class CLI < Mothership
     include VMC::Interactive
     include VMC::Spacing
-    include Mothership::Pretty
-    include Mothership::Progress
 
     option :help, :alias => "-h", :type => :boolean,
       :desc => "Show command usage & instructions"
@@ -148,7 +145,11 @@ module VMC
       msg = e.class.name
       msg << ": #{e}" unless e.to_s.empty?
 
-      File.open(File.expand_path(VMC::CRASH_FILE), "w") do |f|
+      crash_file = File.expand_path(VMC::CRASH_FILE)
+
+      FileUtils.mkdir_p(File.dirname(crash_file))
+
+      File.open(crash_file, "w") do |f|
         f.puts "Time of crash:"
         f.puts "  #{Time.now}"
         f.puts ""
@@ -260,7 +261,7 @@ module VMC
         return exp if File.exist? exp
       end
 
-      paths.first
+      File.expand_path(paths.first)
     end
 
     def client_target
@@ -396,21 +397,21 @@ module VMC
       def find_by_name(what)
         proc { |name, choices, *_|
           choices.find { |c| c.name == name } ||
-            fail("Unknown #{what} '#{name}'")
+            fail("Unknown #{what} '#{name}'.")
         }
       end
 
       def by_name(what, obj = what)
         proc { |name, *_|
           client.send(:"#{obj}_by_name", name) ||
-            fail("Unknown #{what} '#{name}'")
+            fail("Unknown #{what} '#{name}'.")
         }
       end
 
       def find_by_name_insensitive(what)
         proc { |name, choices|
           choices.find { |c| c.name.upcase == name.upcase } ||
-            fail("Unknown #{what} '#{name}'")
+            fail("Unknown #{what} '#{name}'.")
         }
       end
     end

data/vmc-ng/lib/vmc/cli/app/app.rb

@@ -0,0 +1,45 @@
+require "vmc/cli/app/base"
+
+module VMC::App
+  class Apps < Base
+    IS_UTF8 = !!(ENV["LC_ALL"] || ENV["LC_CTYPE"] || ENV["LANG"] || "")["UTF-8"].freeze
+
+    desc "Show app information"
+    group :apps
+    input :app, :argument => :required, :from_given => by_name("app"),
+      :desc => "App to show"
+    def app
+      app = input[:app]
+
+      if quiet?
+        line app.name
+      else
+        display_app(app)
+      end
+    end
+
+    def display_app(a)
+      status = app_status(a)
+
+      line "#{c(a.name, :name)}: #{status}"
+
+      indented do
+        line "platform: #{b(a.framework.name)} on #{b(a.runtime.name)}"
+
+        start_line "usage: #{b(human_mb(a.memory))}"
+        print " #{d(IS_UTF8 ? "\xc3\x97" : "x")} #{b(a.total_instances)}"
+        print " instance#{a.total_instances == 1 ? "" : "s"}"
+
+        line
+
+        unless a.urls.empty?
+          line "urls: #{a.urls.collect { |u| b(u) }.join(", ")}"
+        end
+
+        unless a.services.empty?
+          line "services: #{a.services.collect { |s| b(s.name) }.join(", ")}"
+        end
+      end
+    end
+  end
+end

data/vmc-ng/lib/vmc/cli/app/apps.rb

@@ -0,0 +1,97 @@
+require "vmc/cli/app/base"
+
+module VMC::App
+  class Apps < Base
+    desc "List your applications"
+    group :apps
+    input :space, :from_given => by_name("space"),
+      :default => proc { client.current_space },
+      :desc => "Show apps in given space"
+    input :name, :desc => "Filter by name regexp"
+    input :runtime, :desc => "Filter by runtime regexp"
+    input :framework, :desc => "Filter by framework regexp"
+    input :url, :desc => "Filter by url regexp"
+    input :full, :type => :boolean, :default => false,
+      :desc => "Verbose output format"
+    def apps
+      if space = input[:space]
+        space.summarize! rescue CFoundry::APIError
+
+        apps =
+          with_progress("Getting applications in #{c(space.name, :name)}") do
+            space.apps
+          end
+      else
+        apps =
+          with_progress("Getting applications") do
+            client.apps(:depth => 2)
+          end
+      end
+
+      line unless quiet?
+
+      if apps.empty? and !quiet?
+        line "No applications."
+        return
+      end
+
+      apps.reject! do |a|
+        !app_matches?(a, input)
+      end
+
+      apps = apps.sort_by(&:name)
+
+      if input[:full]
+        spaced(apps) do |a|
+          invoke :app, :app => a
+        end
+      elsif quiet?
+        apps.each do |a|
+          line a.name
+        end
+      else
+        display_apps_table(apps)
+      end
+    end
+
+    def display_apps_table(apps)
+      table(
+        ["name", "status", "usage", v2? && "plan", "runtime", "url"],
+        apps.collect { |a|
+          [ c(a.name, :name),
+            app_status(a),
+            "#{a.total_instances} x #{human_mb(a.memory)}",
+            v2? && (a.production ? "prod" : "dev"),
+            a.runtime.name,
+            if a.urls.empty?
+              d("none")
+            elsif a.urls.size == 1
+              a.url
+            else
+              "#{a.url}, ..."
+            end
+          ]
+        })
+    end
+
+    def app_matches?(a, options)
+      if name = options[:name]
+        return false if a.name !~ /#{name}/
+      end
+
+      if runtime = options[:runtime]
+        return false if a.runtime.name !~ /#{runtime}/
+      end
+
+      if framework = options[:framework]
+        return false if a.framework.name !~ /#{framework}/
+      end
+
+      if url = options[:url]
+        return false if a.urls.none? { |u| u =~ /#{url}/ }
+      end
+
+      true
+    end
+  end
+end

data/vmc-ng/lib/vmc/cli/app/base.rb

@@ -0,0 +1,82 @@
+require "vmc/cli"
+
+module VMC
+  module App
+    class Base < CLI
+      # choose the right color for app/instance state
+      def state_color(s)
+        case s
+        when "STARTING"
+          :neutral
+        when "STARTED", "RUNNING"
+          :good
+        when "DOWN"
+          :bad
+        when "FLAPPING"
+          :error
+        when "N/A"
+          :unknown
+        else
+          :warning
+        end
+      end
+
+      def app_status(a)
+        health = a.health
+
+        if a.debug_mode == "suspend" && health == "0%"
+          c("suspended", :neutral)
+        else
+          c(health.downcase, state_color(health))
+        end
+      end
+
+      def memory_choices(exclude = 0)
+        info = client.info
+        used = info[:usage][:memory]
+        limit = info[:limits][:memory]
+        available = limit - used + exclude
+
+        mem = 64
+        choices = []
+        until mem > available
+          choices << human_mb(mem)
+          mem *= 2
+        end
+
+        choices
+      end
+
+      def human_mb(num)
+        human_size(num * 1024 * 1024, 0)
+      end
+
+      def human_size(num, precision = 1)
+        sizes = ["G", "M", "K"]
+        sizes.each.with_index do |suf, i|
+          pow = sizes.size - i
+          unit = 1024 ** pow
+          if num >= unit
+            return format("%.#{precision}f%s", num / unit, suf)
+          end
+        end
+
+        format("%.#{precision}fB", num)
+      end
+
+      def megabytes(str)
+        if str =~ /T$/i
+          str.to_i * 1024 * 1024
+        elsif str =~ /G$/i
+          str.to_i * 1024
+        elsif str =~ /M$/i
+          str.to_i
+        elsif str =~ /K$/i
+          str.to_i / 1024
+        else # assume megabytes
+          str.to_i
+        end
+      end
+    end
+  end
+end

data/vmc-ng/lib/vmc/cli/app/crashes.rb

@@ -0,0 +1,41 @@
+require "vmc/cli/app/base"
+
+module VMC::App
+  class Crashes < Base
+    desc "List an app's crashed instances"
+    group :apps, :info, :hidden => true
+    input :apps, :argument => :splat, :singular => :app,
+      :desc => "Applications whose crashed instances to list",
+      :from_given => by_name("app")
+    def crashes
+      apps = input[:apps]
+      fail "No applications given." if apps.empty?
+
+      spaced(apps) do |app|
+        instances =
+          with_progress("Getting crashed instances for #{c(app.name, :name)}") do
+            app.crashes
+          end
+
+        spaced(instances) do |i|
+          if quiet?
+            line i.id
+          else
+            display_crashed_instance(i)
+          end
+        end
+      end
+    end
+
+    def display_crashed_instance(i)
+      start_line "instance #{c("\##{i.id}", :instance)}: "
+      puts "#{b(c("crashed", :error))} "
+
+      indented do
+        if s = i.since
+          line "since: #{c(s.strftime("%F %r"), :neutral)}"
+        end
+      end
+    end
+  end
+end

data/vmc-ng/lib/vmc/cli/app/delete.rb

@@ -0,0 +1,90 @@
+require "set"
+
+require "vmc/cli/app/base"
+
+module VMC::App
+  class Delete < Base
+    desc "Delete an application"
+    group :apps, :manage
+    input(:apps, :argument => :splat, :singular => :app,
+          :desc => "Applications to delete",
+          :from_given => by_name("app")) {
+      apps = client.apps
+      fail "No applications." if apps.empty?
+
+      [ask("Delete which application?", :choices => apps.sort_by(&:name),
+           :display => proc(&:name))]
+    }
+    input(:really, :type => :boolean, :forget => true,
+          :default => proc { force? || interact }) { |name, color|
+      ask("Really delete #{c(name, color)}?", :default => false)
+    }
+    input :routes, :type => :boolean, :default => false,
+      :desc => "Delete associated routes"
+    input :orphaned, :aliases => "-o", :type => :boolean,
+      :desc => "Delete orphaned instances"
+    input :all, :type => :boolean, :default => false,
+      :desc => "Delete all applications"
+    def delete
+      apps = client.apps
+
+      if input[:all]
+        return unless input[:really, "ALL APPS", :bad]
+
+        to_delete = apps
+        others = []
+      else
+        to_delete = input[:apps]
+        others = apps - to_delete
+      end
+
+      orphaned = find_orphaned_services(to_delete, others)
+
+      deleted = []
+      spaced(to_delete) do |app|
+        really = input[:all] || input[:really, app.name, :name]
+        next unless really
+
+        deleted << app
+
+        with_progress("Deleting #{c(app.name, :name)}") do
+          app.routes.collect(&:delete!) if input[:routes]
+          app.delete!
+        end
+      end
+
+      delete_orphaned_services(orphaned, input[:orphaned])
+
+      to_delete
+    end
+
+    def find_orphaned_services(apps, others = [])
+      orphaned = Set.new
+
+      apps.each do |a|
+        a.services.each do |i|
+          if others.none? { |x| x.binds?(i) }
+            orphaned << i
+          end
+        end
+      end
+
+      orphaned.each(&:invalidate!)
+    end
+
+    def delete_orphaned_services(instances, orphaned)
+      return if instances.empty?
+
+      line unless quiet? || force?
+
+      instances.select { |i|
+        orphaned ||
+          ask("Delete orphaned service instance #{c(i.name, :name)}?",
+              :default => false)
+      }.each do |instance|
+        # TODO: splat
+        invoke :delete_service, :instance => instance, :really => true
+      end
+    end
+  end
+end