vmc 0.4.2 → 0.4.3

data/lib/vmc/cli/app/push/interaction.rb

@@ -0,0 +1,64 @@
+require "vmc/detect"
+require "vmc/cli/app/base"
+require "vmc/cli/app/push/sync"
+require "vmc/cli/app/push/create"
+
+module VMC::App
+  class Push < Base
+    module Interactions
+      def name
+        ask("Name")
+      end
+
+      def url(name)
+        choices = url_choices(name)
+
+        options = {
+          :choices => choices + ["none"],
+          :allow_other => true
+        }
+
+        options[:default] = choices.first if choices.size == 1
+
+        url = ask "URL", options
+
+        unless url == "none"
+          url
+        end
+      end
+
+      def memory(limit)
+        ask("Memory Limit",
+            :choices => memory_choices,
+            :allow_other => true,
+            :default => default || "64M")
+      end
+
+      def instances
+        ask("Instances", :default => 1)
+      end
+
+      def framework(choices, default, other)
+        ask_with_other("Framework", client.frameworks, choices, default, other)
+      end
+
+      def runtime(choices, default, other)
+        ask_with_other("Runtime", client.runtimes, choices, default, other)
+      end
+
+      def command
+        ask("Startup command")
+      end
+
+      def create_services
+        ask "Create services for application?", :default => false
+      end
+
+      def bind_services
+        return if all_instances.empty?
+
+        ask "Bind other services to application?", :default => false
+      end
+    end
+  end
+end

data/lib/vmc/cli/app/push/sync.rb

@@ -0,0 +1,59 @@
+module VMC::App
+  module Sync
+    def apply_changes(app)
+      app.memory = megabytes(input[:memory]) if input.given?(:memory)
+      app.total_instances = input[:instances] if input.given?(:instances)
+      app.command = input[:command] if input.given?(:command)
+      app.production = input[:plan].upcase.start_with?("P") if input.given?(:plan)
+      app.framework = input[:framework] if input.given?(:framework)
+      app.runtime = input[:runtime] if input.given?(:runtime)
+    end
+
+    def display_changes(app)
+      return unless app.changed?
+
+      line "Changes:"
+
+      app.changes.each do |attr, (old, new)|
+        line "#{c(attr, :name)}: #{diff_str(attr, old)} -> #{diff_str(attr, new)}"
+      end
+    end
+
+    def commit_changes(app)
+      return unless app.changed?
+
+      with_progress("Updating #{c(app.name, :name)}") do
+        app.update!
+      end
+
+      if input[:restart] && app.started?
+        invoke :restart, :app => app
+      end
+    end
+
+    private
+
+    def diff_str(attr, val)
+      case attr
+      when :memory
+        human_mb(val)
+      when :framework, :runtime
+        val.name
+      when :command
+        "'#{val}'"
+      when :production
+        bool(val)
+      else
+        val
+      end
+    end
+
+    def bool(b)
+      if b
+        c("true", :yes)
+      else
+        c("false", :no)
+      end
+    end
+  end
+end

data/lib/vmc/cli/app/rename.rb

@@ -5,7 +5,7 @@ require "vmc/cli/app/base"
 module VMC::App
   class Rename < Base
     desc "Rename an application"
-    group :apps, :manage
+    group :apps, :manage, :hidden => true
     input(:app, :argument => :optional, :desc => "Application to rename",
           :from_given => by_name("app")) {
       apps = client.apps

data/lib/vmc/cli/organization/base.rb

@@ -0,0 +1,14 @@
+require "vmc/cli"
+
+module VMC
+  module Organization
+    class Base < CLI
+      def precondition
+        check_target
+        check_logged_in
+
+        fail "This command is v2-only." unless v2?
+      end
+    end
+  end
+end

data/lib/vmc/cli/organization/create_org.rb

@@ -0,0 +1,28 @@
+require "vmc/cli/organization/base"
+
+module VMC::Organization
+  class CreateOrg < Base
+    desc "Create an organization"
+    group :organizations
+    input(:name, :argument => :optional, :desc => "Organization name") {
+      ask("Name")
+    }
+    input :target, :alias => "-t", :type => :boolean,
+          :desc => "Switch to the organization after creation"
+    input :add_self, :type => :boolean, :default => true,
+          :desc => "Add yourself to the organization"
+    def create_org
+      org = client.organization
+      org.name = input[:name]
+      org.users = [client.current_user] if input[:add_self]
+
+      with_progress("Creating organization #{c(org.name, :name)}") do
+        org.create!
+      end
+
+      if input[:target]
+        invoke :target, :organization => org
+      end
+    end
+  end
+end

data/lib/vmc/cli/organization/delete_org.rb

@@ -0,0 +1,65 @@
+require "vmc/cli/organization/base"
+
+module VMC::Organization
+  class DeleteOrg < Base
+    desc "Delete an organization"
+    group :organizations
+    input(:organization, :aliases => ["--org", "-o"],
+          :argument => :optional,
+          :from_given => by_name("organization"),
+          :desc => "Organization to delete") { |orgs|
+      ask "Which organization?", :choices => orgs,
+          :display => proc(&:name)
+    }
+    input(:really, :type => :boolean, :forget => true,
+          :default => proc { force? || interact }) { |org|
+      ask("Really delete #{c(org.name, :name)}?", :default => false)
+    }
+    input(:recursive, :alias => "-r", :type => :boolean, :forget => true) {
+      ask "Delete #{c("EVERYTHING", :bad)}?", :default => false
+    }
+    input :warn, :type => :boolean, :default => true,
+          :desc => "Show warning if it was the last org"
+    def delete_org
+      orgs = client.organizations
+      fail "No organizations." if orgs.empty?
+
+      org = input[:organization, orgs]
+      return unless input[:really, org]
+
+      spaces = org.spaces
+      unless spaces.empty?
+        unless force?
+          line "This organization is not empty!"
+          line
+          line "spaces: #{name_list(spaces)}"
+          line
+
+          return unless input[:recursive]
+        end
+
+        spaces.each do |s|
+          invoke :delete_space, :space => s, :really => true,
+                 :recursive => true, :warn => false
+        end
+      end
+
+      is_current = org == client.current_organization
+
+      with_progress("Deleting organization #{c(org.name, :name)}") do
+        org.delete!
+      end
+
+      if orgs.size == 1
+        return unless input[:warn]
+
+        line
+        line c("There are no longer any organizations.", :warning)
+        line "You may want to create one with #{c("create-org", :good)}."
+      elsif is_current
+        invalidate_target
+        invoke :target
+      end
+    end
+  end
+end

data/lib/vmc/cli/organization/org.rb

@@ -0,0 +1,46 @@
+require "vmc/cli/organization/base"
+
+module VMC::Organization
+  class Org < Base
+    desc "Show organization information"
+    group :organizations
+    input :organization, :aliases => ["--org", "-o"],
+          :argument => :optional,
+          :from_given => by_name("organization"),
+          :default => proc { client.current_organization },
+          :desc => "Organization to show"
+    input :full, :type => :boolean,
+          :desc => "Show full information for spaces, domains, etc."
+    def org
+      org = input[:organization]
+
+      unless org
+        return if quiet?
+        fail "No current organization."
+      end
+
+      if quiet?
+        puts org.name
+        return
+      end
+
+      line "#{c(org.name, :name)}:"
+
+      indented do
+        line "domains: #{name_list(org.domains)}"
+
+        if input[:full]
+          line "spaces:"
+
+          spaced(org.spaces(:depth => 2)) do |s|
+            indented do
+              invoke :space, :space => s
+            end
+          end
+        else
+          line "spaces: #{name_list(org.spaces)}"
+        end
+      end
+    end
+  end
+end

data/lib/vmc/cli/organization/orgs.rb

@@ -0,0 +1,35 @@
+require "vmc/cli/organization/base"
+
+module VMC::Organization
+  class Orgs < Base
+    desc "List available organizations"
+    group :organizations
+    input :one_line, :alias => "-l", :type => :boolean, :default => false,
+          :desc => "Single-line tabular format"
+    input :full, :type => :boolean, :default => false,
+          :desc => "Show full information for apps, service instances, etc."
+    def orgs
+      orgs =
+          with_progress("Getting organizations") do
+            client.organizations
+          end
+
+      line unless quiet?
+
+      if input[:one_line]
+        table(
+            %w{name spaces domains},
+            orgs.collect { |o|
+              [ c(o.name, :name),
+                name_list(o.spaces),
+                name_list(o.domains)
+              ]
+            })
+      else
+        orgs.each do |o|
+          invoke :org, :organization => o, :full => input[:full]
+        end
+      end
+    end
+  end
+end

data/lib/vmc/cli/organization/rename.rb

@@ -0,0 +1,32 @@
+require "vmc/detect"
+
+require "vmc/cli/organization/base"
+
+module VMC::Organization
+  class Rename < Base
+    desc "Rename an organization"
+    group :organizations, :hidden => true
+    input(:organization, :aliases => ["--org", "-o"],
+          :argument => :optional, :desc => "Organization to rename",
+          :from_given => by_name("organization")) {
+      organizations = client.organizations
+      fail "No organizations." if organizations.empty?
+
+      ask("Rename which organization?", :choices => organizations.sort_by(&:name),
+          :display => proc(&:name))
+    }
+    input(:name, :argument => :optional, :desc => "New organization name") {
+      ask("New name")
+    }
+    def rename_org
+      organization = input[:organization]
+      name = input[:name]
+
+      organization.name = name
+
+      with_progress("Renaming to #{c(name, :name)}") do
+        organization.update!
+      end
+    end
+  end
+end

data/lib/vmc/cli/service/base.rb

@@ -0,0 +1,8 @@
+require "vmc/cli"
+
+module VMC
+  module Service
+    class Base < CLI
+    end
+  end
+end

data/lib/vmc/cli/service/binding.rb

@@ -0,0 +1,66 @@
+require "vmc/detect"
+
+require "vmc/cli/service/base"
+
+module VMC::Service
+  class Binding < Base
+    desc "Bind a service instance to an application"
+    group :services, :manage
+    input(:instance, :argument => true,
+          :from_given => by_name("service instance", :service_instance),
+          :desc => "Service to bind") { |app|
+      instances = client.service_instances
+      fail "No service instances." if instances.empty?
+
+      ask "Which service instance?",
+        :choices => instances - app.services,
+        :display => proc(&:name)
+    }
+    input(:app, :argument => true,
+          :from_given => by_name("app"),
+          :desc => "Application to bind to") {
+      ask "Which application?", :choices => client.apps(:depth => 2),
+        :display => proc(&:name)
+    }
+    def bind_service
+      app = input[:app]
+      instance = input[:instance, app]
+
+      with_progress(
+          "Binding #{c(instance.name, :name)} to #{c(app.name, :name)}") do |s|
+        if app.binds?(instance)
+          s.skip do
+            err "App #{b(app.name)} already binds #{b(instance.name)}."
+          end
+        else
+          app.bind(instance)
+        end
+      end
+    end
+
+
+    desc "Unbind a service from an application"
+    group :services, :manage
+    input(:instance, :argument => true,
+          :from_given => find_by_name("service instance"),
+          :desc => "Service to bind") { |services|
+      ask "Which service instance?", :choices => services,
+        :display => proc(&:name)
+    }
+    input(:app, :argument => true,
+          :from_given => by_name("app"),
+          :desc => "Application to bind to") {
+      ask "Which application?", :choices => client.apps(:depth => 2),
+        :display => proc(&:name)
+    }
+    def unbind_service
+      app = input[:app]
+      instance = input[:instance, app.services]
+
+      with_progress(
+          "Unbinding #{c(instance.name, :name)} from #{c(app.name, :name)}") do
+        app.unbind(instance)
+      end
+    end
+  end
+end

data/lib/vmc/cli/service/create.rb

@@ -0,0 +1,104 @@
+require "vmc/detect"
+
+require "vmc/cli/service/base"
+
+module VMC::Service
+  class Create < Base
+    services_from_label = proc { |label, services|
+      services.select { |s| s.label == label }
+    }
+
+    desc "Create a service"
+    group :services, :manage
+    input(:service, :argument => true,
+          :desc => "What kind of service (e.g. redis, mysql)",
+          :from_given => services_from_label) { |services|
+      [ask("What kind?", :choices => services.sort_by(&:label),
+           :display => proc { |s|
+              str = "#{c(s.label, :name)} #{s.version}"
+              if s.provider != "core"
+                str << ", via #{s.provider}"
+              end
+              str
+           },
+           :complete => proc { |s| "#{s.label} #{s.version}" })]
+    }
+    input(:name, :argument => true,
+          :desc => "Name for your instance") { |service|
+      random = sprintf("%x", rand(1000000))
+      ask "Name?", :default => "#{service.label}-#{random}"
+    }
+    input(:plan, :desc => "Service plan",
+          :default => proc { |plans|
+            plans.find { |p| p.name == "D100" } ||
+              interact
+          },
+          :from_given => find_by_name_insensitive("plan")) { |plans|
+      ask "Which plan?", :choices => plans.sort_by(&:name),
+        :display => proc { |p| "#{p.name}: #{p.description}" },
+        :complete => proc(&:name)
+    }
+    input :provider, :desc => "Service provider"
+    input :version, :desc => "Service version"
+    input :app, :alias => "--bind", :from_given => by_name("app"),
+      :desc => "Application to immediately bind to"
+    def create_service
+      services = client.services
+
+      if input[:provider]
+        services.reject! { |s| s.provider != input[:provider] }
+      end
+
+      if input[:version]
+        services.reject! { |s| s.version != input[:version] }
+      elsif !v2?
+        services.reject!(&:deprecated?)
+      end
+
+      if v2? && plan = input.given(:plan)
+        services.reject! do |s|
+          if plan.is_a?(String)
+            s.service_plans.none? { |p| p.name == plan.upcase }
+          else
+            s.service_plans.include? plan
+          end
+        end
+      end
+
+      until services.size < 2
+        # cast to Array since it might be given as a Service with #invoke
+        services = Array(input[:service, services.sort_by(&:label)])
+        input.forget(:service)
+      end
+
+      if services.empty?
+        fail "Cannot find services matching the given criteria."
+      end
+
+      service = services.first
+
+      instance = client.service_instance
+      instance.name = input[:name, service]
+
+      if v2?
+        instance.service_plan = input[:plan, service.service_plans]
+        instance.space = client.current_space
+      else
+        instance.type = service.type
+        instance.vendor = service.label
+        instance.version = service.version
+        instance.tier = "free"
+      end
+
+      with_progress("Creating service #{c(instance.name, :name)}") do
+        instance.create!
+      end
+
+      if app = input[:app]
+        invoke :bind_service, :instance => instance, :app => app
+      end
+
+      instance
+    end
+  end
+end