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

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

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

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

@@ -0,0 +1,31 @@
+require "vmc/cli/domain/base"
+
+module VMC::Domain
+  class CreateDomain < Base
+    desc "Create a domain"
+    group :domains
+    input :name, :argument => :required,
+          :desc => "Domain name to create"
+    input :organization, :aliases => ["--org", "-o"],
+          :from_given => by_name("organization"),
+          :default => proc { client.current_organization },
+          :desc => "Organization to add the domain to"
+    input :shared, :type => :boolean, :default => false,
+          :desc => "Create a shared domain (admin-only)"
+
+    def create_domain
+      org = input[:organization]
+      name = input[:name].sub(/^\*\./, "")
+
+      domain = client.domain
+      domain.name = name
+      domain.owning_organization = org unless input[:shared]
+
+      with_progress("Creating domain #{c(name, :name)}") do
+        domain.create!
+      end
+
+      domain
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+require "vmc/cli/domain/base"
+
+module VMC::Domain
+  class DeleteDomain < Base
+    desc "Delete a domain"
+    group :domains
+    input(:domain, :argument => :optional,
+          :from_given => find_by_name("domain"),
+          :desc => "URL to map to the application") { |domains|
+      fail "No domains." if domains.empty?
+
+      ask "Which domain?", :choices => domains.sort_by(&:name),
+          :display => proc(&:name)
+    }
+    input :organization, :aliases => ["--org", "-o"],
+          :from_given => by_name("organization"),
+          :desc => "Organization to delete the domain from"
+    input(:really, :type => :boolean, :forget => true,
+          :default => proc { force? || interact }) { |name, color|
+      ask("Really delete #{c(name, color)}?", :default => false)
+    }
+    input :all, :type => :boolean, :default => false,
+          :desc => "Delete all domains"
+
+    def delete_domain
+      target = input[:organization] || client
+
+      if input[:all]
+        return unless input[:really, "ALL DOMAINS", :bad]
+
+        target.domains.each do |r|
+          begin
+            invoke :delete_domain, :domain => r, :really => true
+          rescue CFoundry::APIError => e
+            err "#{e.class}: #{e.message}"
+          end
+        end
+
+        return
+      end
+
+      domain = input[:domain, target.domains]
+
+      return unless input[:really, domain.name, :name]
+
+      with_progress("Deleting domain #{c(domain.name, :name)}") do
+        domain.delete!
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+require "vmc/cli/domain/base"
+
+module VMC::Domain
+  class Domains < Base
+    desc "List domains in a space"
+    group :domains
+    input :space, :argument => :optional,
+          :default => proc { client.current_space },
+          :from_given => by_name("space"),
+          :desc => "Space to list the domains from"
+    input :all, :type => :boolean, :default => false,
+          :desc => "List all domains"
+
+    def domains
+      space = input[:space]
+
+      domains =
+        if input[:all]
+          with_progress("Getting all domains") do
+            client.domains
+          end
+        else
+          with_progress("Getting domains in #{c(space.name, :name)}") do
+            space.domains
+          end
+        end
+
+      line unless quiet?
+
+      table(
+        %w{name owner},
+        domains.sort_by(&:name).collect { |r|
+          [c(r.name, :name),
+           if org = r.owning_organization
+             c(org.name, :name)
+           else
+             d("none")
+           end
+          ]
+        })
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require "vmc/cli/domain/base"
+
+module VMC::Domain
+  class RemoveDomain < Base
+    desc "Remove a domain from a space"
+    group :domains
+    input(:domain, :argument => :optional,
+          :from_given => by_name("domain"),
+          :desc => "Domain to add") { |space|
+      ask "Which domain?", :choices => space.domains,
+          :display => proc(&:name)
+    }
+    input :space, :from_given => by_name("space"),
+          :default => proc { client.current_space },
+          :desc => "Space to add the domain to"
+
+    def remove_domain
+      space = input[:space]
+      domain = input[:domain, space]
+
+      with_progress("Removing #{c(domain.name, :name)} from #{c(space.name, :name)}") do
+        space.remove_domain(domain)
+      end
+    end
+  end
+end

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

@@ -13,4 +13,3 @@ Mothership::Help.groups(
   [:domains, "Domains"],
   [:admin, "Administration",
     [:user, "User Management"]])
-

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

@@ -1,8 +1,12 @@
 require "interact"
+require "interact/pretty"
+require "interact/progress"
 
 module VMC
   module Interactive
     include ::Interactive::Rewindable
+    include Interact::Pretty
+    include Interact::Progress
 
     def ask(question, options = {})
       if force? and options.key?(:default)

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

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

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

@@ -0,0 +1,42 @@
+require "vmc/cli/route/base"
+
+module VMC::Route
+  class CreateRoute < Base
+    desc "Create a route"
+    group :routes
+    input :url, :argument => :optional,
+          :desc => "Full route in URL form"
+    input(:host, :desc => "Host name") {
+      ask "Host name?"
+    }
+    input(:domain, :desc => "Domain to add the route to",
+          :from_given => find_by_name("domain")) { |domains|
+      ask "Which domain?", :choices => domains,
+          :display => proc(&:name)
+    }
+
+    def create_route
+      if url = input[:url]
+        host, domain_name = url.split(".", 2)
+        return invoke :create_route, {}, :host => host, :domain => domain_name
+      end
+
+      domain = input[:domain, client.current_organization.domains]
+      host = input[:host]
+
+      route = client.route
+      route.host = host
+      route.domain = domain
+      route.space = client.current_space
+
+      with_progress("Creating route #{c("#{host}.#{domain.name}", :name)}") do
+        route.create!
+      end
+    rescue CFoundry::RouteHostTaken => e
+      line c(e.description, :error)
+      line
+      input.forget(:host)
+      retry
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require "vmc/cli/route/base"
+
+module VMC::Route
+  class DeleteRoute < Base
+    desc "Delete a route"
+    group :routes
+    input(:route, :argument => :optional,
+          :from_given => find_by_name("route"),
+          :desc => "Route to delete") { |routes|
+      ask "Which route?", :choices => routes.sort_by(&:name),
+        :display => proc(&:name)
+    }
+    input(:really, :type => :boolean, :forget => true, :hidden => true,
+          :default => proc { force? || interact }) { |name, color|
+      ask("Really delete #{c(name, color)}?", :default => false)
+    }
+    input :all, :type => :boolean, :default => false,
+      :desc => "Delete all routes"
+    def delete_route
+      if input[:all]
+        return unless input[:really, "ALL ROUTES", :bad]
+
+        client.routes.each do |r|
+          invoke :delete_route, :route => r, :really => true
+        end
+
+        return
+      end
+
+      routes = client.routes
+      fail "No routes." if routes.empty?
+
+      route = input[:route, client.routes]
+
+      return unless input[:really, route.name, :name]
+
+      with_progress("Deleting route #{c(route.name, :name)}") do
+        route.delete!
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require "vmc/cli/route/base"
+
+module VMC::Route
+  class Routes < Base
+    desc "List routes in a space"
+    group :routes
+
+    def routes
+      # TODO: scope to space once space.routes is possible
+      routes =
+          with_progress("Getting routes") do
+            client.routes
+          end
+
+      line unless quiet?
+
+      table(
+          %w{host domain},
+          routes.sort_by { |r| "#{r.domain.name} #{r.host}" }.collect { |r|
+            [c(r.host, :name),
+             r.domain.name
+            ]
+          })
+    end
+  end
+end

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

@@ -87,11 +87,11 @@ module VMC
       @detector_frameworks = {}
 
       Clouseau.detectors.each do |d|
-        name = d.framework_name.to_s
+        name = d.framework_name
         lang = d.language_name
 
         framework = all_frameworks.find { |f|
-          f.name == name ||
+          f.name == name.to_s ||
             f.name == FRAMEWORK_NAMES[name]
         }
 

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

@@ -0,0 +1 @@
+require File.expand_path("../../../spec/spec_helper", __FILE__)

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.93"
+  VERSION = "0.4.0.beta.94".freeze
 end

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

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require "vmc/cli/app/push"
+
+describe VMC::App::Push do
+  let(:global_inputs) { { :color => false, :quiet => true } }
+  let(:inputs) { {} }
+  let(:given) { {} }
+  let(:client) { FactoryGirl.build(:client) }
+
+  before do
+    any_instance_of(VMC::CLI) do |cli|
+      stub(cli).client { client }
+      stub(cli).precondition { nil }
+    end
+  end
+
+  describe 'CLI' do
+    subject { Mothership.new.invoke(:push, inputs, given, global_inputs) }
+
+    context 'when creating a new app' do
+    end
+
+    context 'when syncing an existing app' do
+    end
+  end
+
+  describe '#create_app' do
+    xit 'should detect the correct framework'
+  end
+
+  describe '#sync_app' do
+
+  end
+end

data/vmc-ng/spec/cli/app/rename_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+require "vmc/cli/app/rename"
+
+describe VMC::App::Rename do
+  let(:global_inputs) { { :color => false, :quiet => true } }
+  let(:inputs) { {} }
+  let(:given) { {} }
+  let(:client) { FactoryGirl.build(:client) }
+  let(:app) {}
+  let(:new_name) { "some-new-name" }
+
+  before do
+    any_instance_of(VMC::CLI) do |cli|
+      stub(cli).client { client }
+      stub(cli).precondition { nil }
+    end
+  end
+
+  subject { Mothership.new.invoke(:rename, inputs, given, global_inputs) }
+
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:rename] }
+
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "Rename an application" }
+      it { expect(Mothership::Help.group(:apps, :manage)).to include(subject) }
+    end
+
+    describe 'inputs' do
+      subject { command.inputs }
+      it { expect(subject[:app][:description]).to eq "Application to rename" }
+      it { expect(subject[:name][:description]).to eq "New application name" }
+    end
+
+    describe 'arguments' do
+      subject { command.arguments }
+      it 'has the correct argument order' do
+        should eq([
+          { :type => :optional, :value => nil, :name => :app },
+          { :type => :optional, :value => nil, :name => :name }
+        ])
+      end
+    end
+  end
+
+  context 'when there are no apps' do
+    context 'and an app is given' do
+      let(:given) { { :app => "some-app" } }
+      it { expect { subject }.to raise_error(VMC::UserError, "Unknown app 'some-app'.") }
+    end
+
+    context 'and an app is not given' do
+      it { expect { subject }.to raise_error(VMC::UserError, "No applications.") }
+    end
+  end
+
+  context 'when there are apps' do
+    let(:client) { FactoryGirl.build(:client, :apps => apps) }
+    let(:apps) { FactoryGirl.build_list(:app, 2) }
+    let(:renamed_app) { apps.first }
+
+    context 'when the defaults are used' do
+      it 'asks for the app and new name and renames' do
+        mock_ask("Rename which application?", anything) { renamed_app }
+        mock_ask("New name") { new_name }
+        mock(renamed_app).name=(new_name)
+        mock(renamed_app).update!
+        subject
+      end
+    end
+
+    context 'when no name is provided, but a app is' do
+      let(:given) { { :app => renamed_app.name } }
+
+      it 'asks for the new name and renames' do
+        dont_allow_ask("Rename which application?", anything)
+        mock_ask("New name") { new_name }
+        mock(renamed_app).name=(new_name)
+        mock(renamed_app).update!
+        subject
+      end
+    end
+
+    context 'when an app is provided and a name' do
+      let(:inputs) { { :app => renamed_app, :name => new_name } }
+
+      it 'renames the app' do
+        mock(renamed_app).update!
+        subject
+      end
+
+      it 'displays the progress' do
+        mock_with_progress("Renaming to #{new_name}")
+        mock(renamed_app).update!
+
+        subject
+      end
+
+      context 'and the name already exists' do
+        it 'fails' do
+          mock(renamed_app).update! { raise CFoundry::AppNameTaken }
+          expect { subject }.to raise_error(CFoundry::AppNameTaken)
+        end
+      end
+    end
+  end
+end