vmc 0.4.5 → 0.4.6

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

@@ -1,3 +1,4 @@
+require "thread"
 require "vmc/cli/app/base"
 
 module VMC::App
@@ -67,19 +68,74 @@ module VMC::App
     input :app, :argument => true,
       :desc => "Application to inspect the file of",
       :from_given => by_name("app")
-    input :path, :argument => true, :default => "/",
-      :desc => "Path of file to stream"
+    input :path, :argument => :optional, :default => nil,
+      :desc => "Path of file to stream (default: all)"
     def tail
       app = input[:app]
-      path = input[:path]
 
-      app.stream_file(*path.split("/")) do |contents|
-        print contents
+      lines = Queue.new
+      max_len = 0
+
+      if path = input[:path]
+        max_len = path.size
+        app.instances.each do |i|
+          Thread.new do
+            stream_path(lines, i, path.split("/"))
+          end
+        end
+      else
+        app.instances.each do |i|
+          i.files("logs").each do |path|
+            len = path.join("/").size
+            max_len = len if len > max_len
+
+            Thread.new do
+              stream_path(lines, i, path)
+            end
+          end
+        end
+      end
+
+      while line = lines.pop
+        instance, path, log = line
+
+        unless log.end_with?("\n")
+          log += i("%") if color?
+          log += "\n"
+        end
+
+        print "\##{c(instance.id, :instance)}  "
+        print "#{c(path.join("/").ljust(max_len), :name)}  "
+        print log
       end
     rescue CFoundry::NotFound
       fail "Invalid path #{b(path)} for app #{b(app.name)}"
     rescue CFoundry::FileError => e
       fail e.description
     end
+
+    def stream_path(lines, instance, path)
+      if verbose?
+        lines << [instance, path, c("streaming...", :good) + "\n"]
+      end
+
+      instance.stream_file(*path) do |contents|
+        contents.each_line do |line|
+          lines << [instance, path, line]
+        end
+      end
+
+      lines << [instance, path, c("end of file", :bad) + "\n"]
+    rescue Timeout::Error
+      if verbose?
+        lines << [
+          instance,
+          path,
+          c("timed out; reconnecting...", :bad) + "\n"
+        ]
+      end
+
+      retry
+    end
   end
 end

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

@@ -0,0 +1,87 @@
+module VMC::App
+  module PushInteractions
+    def ask_name
+      ask("Name")
+    end
+
+    def ask_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 ask_memory(default)
+      ask("Memory Limit",
+          :choices => memory_choices,
+          :allow_other => true,
+          :default => default || "64M")
+    end
+
+    def ask_instances
+      ask("Instances", :default => 1)
+    end
+
+    def ask_framework(choices, default, other)
+      ask_with_other("Framework", client.frameworks, choices, default, other)
+    end
+
+    def ask_runtime(choices, default, other)
+      ask_with_other("Runtime", client.runtimes, choices, default, other)
+    end
+
+    def ask_command
+      ask("Startup command")
+    end
+
+    def ask_create_services
+      line unless quiet?
+      ask "Create services for application?", :default => false
+    end
+
+    def ask_bind_services
+      return if all_instances.empty?
+
+      ask "Bind other services to application?", :default => false
+    end
+
+    private
+
+    def ask_with_other(message, all, choices, default, other)
+      choices = choices.sort_by(&:name)
+      choices << other if other
+
+      opts = {
+        :choices => choices,
+        :display => proc { |x|
+          if other && x == other
+            "other"
+          else
+            x.name
+          end
+        }
+      }
+
+      opts[:default] = default if default
+
+      res = ask(message, opts)
+
+      if other && res == other
+        opts[:choices] = all
+        res = ask(message, opts)
+      end
+
+      res
+    end
+  end
+end

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

@@ -20,10 +20,10 @@ module VMC::App
     end
 
     def commit_changes(app)
-      return unless app.changed?
-
-      with_progress("Updating #{c(app.name, :name)}") do
-        app.update!
+      if app.changed?
+        with_progress("Updating #{c(app.name, :name)}") do
+          app.update!
+        end
       end
 
       if input[:restart] && app.started?

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

@@ -0,0 +1,32 @@
+require "vmc/cli/organization/base"
+
+module VMC::Organization
+  class Create < Base
+    desc "Create an organization"
+    group :organizations
+    input :name, :desc => "Organization name", :argument => :optional
+    input :target, :desc => "Switch to the organization after creation",
+          :alias => "-t", :default => true
+    input :add_self, :desc => "Add yourself to the organization",
+          :default => true
+    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
+
+    private
+
+    def ask_name
+      ask("Name")
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+require "vmc/cli/organization/base"
+
+module VMC::Organization
+  class Delete < Base
+    desc "Delete an organization"
+    group :organizations
+    input :organization, :desc => "Organization to delete",
+          :aliases => %w{--org -o}, :argument => :optional,
+          :from_given => by_name(:organization)
+    input :recursive, :desc => "Delete recursively", :alias => "-r",
+          :default => false, :forget => true
+    input :warn, :desc => "Show warning if it was the last org",
+          :default => true
+    input :really, :type => :boolean, :forget => true, :hidden => true,
+          :default => proc { force? || interact }
+    def delete_org
+      org = input[:organization]
+      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
+
+    private
+
+    def ask_organization
+      orgs = client.organizations
+      fail "No organizations." if orgs.empty?
+
+      ask("Which organization", :choices => orgs.sort_by(&:name),
+          :display => proc(&:name))
+    end
+
+    def ask_really(org)
+      ask("Really delete #{c(org.name, :name)}?", :default => false)
+    end
+
+    def ask_recursive
+      ask "Delete #{c("EVERYTHING", :bad)}?", :default => false
+    end
+  end
+end

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

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

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

@@ -0,0 +1,38 @@
+require "vmc/detect"
+
+require "vmc/cli/service/base"
+
+module VMC::Service
+  class Binding < Base
+    desc "Unbind a service from an application"
+    group :services, :manage
+    input :service, :desc => "Service to unbind", :argument => true,
+          :from_given => by_name(:service, :service_instance)
+    input :app, :desc => "Application to unbind from", :argument => true,
+          :from_given => by_name(:app)
+    def unbind_service
+      app = input[:app]
+      service = input[:service, app]
+
+      with_progress(
+          "Unbinding #{c(service.name, :name)} from #{c(app.name, :name)}") do
+        app.unbind(service)
+      end
+    end
+
+    private
+
+    def ask_service(app)
+      services = app.services
+      fail "No bound services." if services.empty?
+
+      ask "Which service?", :choices => services,
+        :display => proc(&:name)
+    end
+
+    def ask_app
+      ask "Which application?", :choices => client.apps,
+        :display => proc(&:name)
+    end
+  end
+end

data/lib/vmc/cli/space/spaces.rb

@@ -19,13 +19,13 @@ module VMC::Space
       org = input[:organization]
       spaces =
         with_progress("Getting spaces in #{c(org.name, :name)}") do
-          org.spaces
+          org.spaces(:depth => quiet? ? 0 : 1)
         end
 
       line unless quiet?
 
-      spaces.filter! do |s|
-        space_matches?(s, input)
+      spaces.reject! do |s|
+        !space_matches?(s, input)
       end
 
       if input[:one_line]

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

@@ -38,14 +38,8 @@ module VMC
         changed_org = false
 
         if input.given?(:organization) || !org_valid?(info[:organization])
-          orgs = client.organizations
-          fail "No organizations!" if orgs.empty?
-
-          if orgs.size == 1 && !input.given?(:organization)
-            org = orgs.first
-          else
-            org = input[:organization, orgs.sort_by(&:name)]
-          end
+          org = input[:organization]
+          return unless org
 
           with_progress("Switching to organization #{c(org.name, :name)}") do
             info[:organization] = org.guid
@@ -57,24 +51,8 @@ module VMC
 
         # switching org means switching space
         if changed_org || input.given?(:space) || !space_valid?(info[:space])
-          spaces = org.spaces
-
-          if spaces.empty?
-            if changed_org
-              line c("There are no spaces in #{b(org.name)}.", :warning)
-              line "You may want to create one with #{c("create-space", :good)}."
-              return
-            else
-              fail "No spaces!"
-            end
-          end
-
-          if spaces.size == 1 && !input.given?(:space)
-            space = spaces.first
-          else
-            line if changed_org && input.interactive?(:organization)
-            space = input[:space, spaces.sort_by(&:name)]
-          end
+          space = input[:space, org]
+          return unless space
 
           with_progress("Switching to space #{c(space.name, :name)}") do
             info[:space] = space.guid

data/lib/vmc/cli/start/login.rb

@@ -9,14 +9,38 @@ module VMC::Start
           :desc => "Account email"
     input :password, :desc => "Account password"
     input(:organization, :aliases => ["--org", "-o"],
-          :from_given => find_by_name("organization"),
-          :desc => "Organization") { |orgs|
-      ask("Organization", :choices => orgs, :display => proc(&:name))
+          :from_given => by_name("organization"),
+          :desc => "Organization") {
+      orgs = client.organizations(:depth => 0)
+
+      if orgs.empty?
+        unless quiet?
+          line
+          line c("There are no organizations.", :warning)
+          line "You may want to create one with #{c("create-org", :good)}."
+        end
+      elsif orgs.size == 1 && !input.interactive?(:organization)
+        orgs.first
+      else
+        ask("Organization",
+            :choices => orgs.sort_by(&:name),
+            :display => proc(&:name))
+      end
     }
     input(:space, :alias => "-s",
-          :from_given => find_by_name("space"),
-          :desc => "Space") { |spaces|
-      ask("Space", :choices => spaces, :display => proc(&:name))
+          :from_given => by_name("space"),
+          :desc => "Space") { |org|
+      spaces = org.spaces(:depth => 0)
+
+      if spaces.empty?
+        unless quiet?
+          line
+          line c("There are no spaces in #{b(org.name)}.", :warning)
+          line "You may want to create one with #{c("create-space", :good)}."
+        end
+      else
+        ask("Space", :choices => spaces, :display => proc(&:name))
+      end
     }
     def login
       show_context

data/lib/vmc/cli/start/target.rb

@@ -7,14 +7,38 @@ module VMC::Start
     group :start
     input :url, :argument => :optional, :desc => "Target URL to switch to"
     input(:organization, :aliases => ["--org", "-o"],
-          :from_given => find_by_name("organization"),
-          :desc => "Organization") { |orgs|
-      ask("Organization", :choices => orgs, :display => proc(&:name))
+          :from_given => by_name("organization"),
+          :desc => "Organization") {
+      orgs = client.organizations(:depth => 0)
+
+      if orgs.empty?
+        unless quiet?
+          line
+          line c("There are no organizations.", :warning)
+          line "You may want to create one with #{c("create-org", :good)}."
+        end
+      elsif orgs.size == 1 && !input.interactive?(:organization)
+        orgs.first
+      else
+        ask("Organization",
+            :choices => orgs.sort_by(&:name),
+            :display => proc(&:name))
+      end
     }
     input(:space, :alias => "-s",
-          :from_given => find_by_name("space"),
-          :desc => "Space") { |spaces|
-      ask("Space", :choices => spaces, :display => proc(&:name))
+          :from_given => by_name("space"),
+          :desc => "Space") { |org|
+      spaces = org.spaces(:depth => 0)
+
+      if spaces.empty?
+        unless quiet?
+          line
+          line c("There are no spaces in #{b(org.name)}.", :warning)
+          line "You may want to create one with #{c("create-space", :good)}."
+        end
+      else
+        ask("Space", :choices => spaces, :display => proc(&:name))
+      end
     }
     def target
       if !input.given?(:url) && !input.given?(:organization) && !input.given?(:space)

data/lib/vmc/cli/start/target_interactions.rb

@@ -0,0 +1,35 @@
+module VMC::Start
+  module TargetInteractions
+    def ask_organization
+      orgs = client.organizations(:depth => 0)
+
+      if orgs.empty?
+        unless quiet?
+          line
+          line c("There are no organizations.", :warning)
+          line "You may want to create one with #{c("create-org", :good)}."
+        end
+      elsif orgs.size == 1 && !input.interactive?(:organization)
+        orgs.first
+      else
+        ask("Organization",
+            :choices => orgs.sort_by(&:name),
+            :display => proc(&:name))
+      end
+    end
+
+    def ask_space(org)
+      spaces = org.spaces(:depth => 0)
+
+      if spaces.empty?
+        unless quiet?
+          line
+          line c("There are no spaces in #{b(org.name)}.", :warning)
+          line "You may want to create one with #{c("create-space", :good)}."
+        end
+      else
+        ask("Space", :choices => spaces, :display => proc(&:name))
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+require "vmc/cli"
+
+module VMC
+  module User
+    class Base < CLI
+      def precondition
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+require "vmc/cli/user/base"
+
+module VMC::User
+  class Create < Base
+    desc "Create a user"
+    group :admin, :user, :hidden => true
+    input :email, :desc => "User email", :argument => true
+    input :password, :desc => "User password"
+    input :verify, :desc => "Repeat password"
+    def create_user
+      email = input[:email]
+      password = input[:password]
+
+      if !force? && password != input[:verify]
+        fail "Passwords don't match."
+      end
+
+      with_progress("Creating user") do
+        client.register(email, password)
+      end
+    end
+
+    alias_command :create_user, :add_user
+
+    def ask_email
+      ask("Email")
+    end
+
+    def ask_password
+      ask("Password", :echo => "*", :forget => true)
+    end
+
+    def ask_verify
+      ask("Verify Password", :echo => "*", :forget => true)
+    end
+  end
+end

data/lib/vmc/cli/user/delete.rb

@@ -0,0 +1,25 @@
+require "vmc/cli/user/base"
+
+module VMC::User
+  class Delete < Base
+    desc "Delete a user"
+    group :admin, :user, :hidden => true
+    input :email, :desc => "User to delete", :argument => true
+    input :really, :type => :boolean, :forget => true, :hidden => true,
+          :default => proc { force? || interact }
+    def delete_user
+      email = input[:email]
+      return unless input[:really, email]
+
+      with_progress("Deleting #{c(email, :name)}") do
+        client.user(email).delete!
+      end
+    end
+
+    private
+
+    def ask_really(email)
+      ask("Really delete user #{c(email, :name)}?", :default => false)
+    end
+  end
+end

data/lib/vmc/cli/user/passwd.rb

@@ -0,0 +1,53 @@
+require "vmc/cli/user/base"
+
+module VMC::User
+  class Passwd < Base
+    desc "Update a user's password"
+    group :admin, :user, :hidden => true
+    input :user, :desc => "User to update", :argument => :optional,
+          :default => proc { client.current_user },
+          :from_given => proc { |email|
+            if v2? && client.current_user.email != email
+              fail "You can only change your own password on V2."
+            else
+              client.user(email)
+            end
+          }
+    input :password, :desc => "Current password"
+    input :new_password, :desc => "New password"
+    input :verify, :desc => "Repeat new password"
+    def passwd
+      user = input[:user]
+      password = input[:password] if v2?
+      new_password = input[:new_password]
+      verify = input[:verify]
+
+      if new_password != verify
+        fail "Passwords don't match."
+      end
+
+      with_progress("Changing password") do
+        if v2?
+          user.change_password!(new_password, password)
+        else
+          user.password = new_password
+          user.update!
+        end
+      end
+    end
+
+    private
+
+    def ask_password
+      ask("Current Password", :echo => "*", :forget => true)
+    end
+
+    def ask_new_password
+      ask("New Password", :echo => "*", :forget => true)
+    end
+
+    def ask_verify
+      ask("Verify Password", :echo => "*", :forget => true)
+    end
+  end
+end

data/lib/vmc/cli/user/users.rb

@@ -0,0 +1,32 @@
+require "vmc/cli/user/base"
+
+module VMC::User
+  class Users < Base
+    desc "List all users"
+    group :admin, :hidden => true
+    def users
+      users =
+        with_progress("Getting users") do
+          client.users(:depth => 0)
+        end
+
+      spaced(users) do |u|
+        display_user(u)
+      end
+    end
+
+    private
+
+    def display_user(u)
+      if quiet?
+        puts u.email
+      else
+        line "#{c(u.email, :name)}:"
+
+        indented do
+          line "admin?: #{c(u.admin?, u.admin? ? :yes : :no)}"
+        end
+      end
+    end
+  end
+end

data/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.5".freeze
+  VERSION = "0.4.6".freeze
 end

data/spec/vmc/cli/app/push_spec.rb

@@ -266,12 +266,12 @@ describe VMC::App::Push do
         end
 
         context 'but there are no changes' do
-          let(:inputs) { { :restart => true} }
+          let(:inputs) { { :restart => true } }
 
-          it 'does not restart' do
+          it 'invokes the restart command' do
             stub(push).line
             dont_allow(app).update!
-            dont_allow(push).invoke
+            mock(push).invoke(:restart, :app => app)
             subject
           end
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-07 00:00:00 -08:00
+date: 2012-12-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,12 +90,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 3
-        - 4
-        version: 0.3.4
+        - 5
+        version: 0.3.5
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -263,12 +263,15 @@ files:
 - lib/vmc/plugin.rb
 - lib/vmc/constants.rb
 - lib/vmc/cli.rb
+- lib/vmc/cli/organization/create.rb
 - lib/vmc/cli/organization/rename.rb
 - lib/vmc/cli/organization/delete_org.rb
 - lib/vmc/cli/organization/orgs.rb
 - lib/vmc/cli/organization/base.rb
+- lib/vmc/cli/organization/delete.rb
 - lib/vmc/cli/organization/org.rb
 - lib/vmc/cli/organization/create_org.rb
+- lib/vmc/cli/start/target_interactions.rb
 - lib/vmc/cli/start/targets.rb
 - lib/vmc/cli/start/register.rb
 - lib/vmc/cli/start/colors.rb
@@ -286,6 +289,7 @@ files:
 - lib/vmc/cli/app/health.rb
 - lib/vmc/cli/app/files.rb
 - lib/vmc/cli/app/push/create.rb
+- lib/vmc/cli/app/push/interactions.rb
 - lib/vmc/cli/app/push/sync.rb
 - lib/vmc/cli/app/rename.rb
 - lib/vmc/cli/app/routes.rb
@@ -319,11 +323,18 @@ files:
 - lib/vmc/cli/space/delete.rb
 - lib/vmc/cli/service/service.rb
 - lib/vmc/cli/service/binding.rb
+- lib/vmc/cli/service/bind.rb
 - lib/vmc/cli/service/create.rb
 - lib/vmc/cli/service/rename.rb
 - lib/vmc/cli/service/services.rb
+- lib/vmc/cli/service/unbind.rb
 - lib/vmc/cli/service/base.rb
 - lib/vmc/cli/service/delete.rb
+- lib/vmc/cli/user/passwd.rb
+- lib/vmc/cli/user/create.rb
+- lib/vmc/cli/user/base.rb
+- lib/vmc/cli/user/delete.rb
+- lib/vmc/cli/user/users.rb
 - lib/vmc/cli/help.rb
 - lib/vmc.rb
 - spec/support/interact_helpers.rb