cf 3.0.1.rc1 → 3.1.0.rc1

data/lib/cf/cli/app/events.rb

@@ -0,0 +1,45 @@
+require "cf/cli/app/base"
+
+module CF::App
+  class Events < Base
+    desc "Display application events"
+    group :apps, :info, :hidden => true
+    input :app, :desc => "Application to get the events for",
+          :argument => true, :from_given => by_name(:app)
+    def events
+      app = input[:app]
+
+      events =
+        with_progress("Getting events for #{c(app.name, :name)}") do
+          format_events(app.events)
+        end
+
+      line unless quiet?
+      table(%w{time instance\ index description exit\ status}, events)
+
+    end
+
+    private
+
+    def sort_events(events)
+      events.sort_by { |event| DateTime.parse(event.timestamp) }
+    end
+
+    def format_events(events)
+      sort_events(events).map do |event|
+        [event.timestamp,
+         c(event.instance_index.to_s, :warning),
+         event.exit_description,
+         format_status(event)]
+      end
+    end
+
+    def format_status(event)
+      if event.exit_status == 0
+        c("Success (#{event.exit_status})", :good)
+      else
+        c("Failure (#{event.exit_status})", :bad)
+      end
+    end
+  end
+end

data/lib/cf/cli/app/restart.rb

@@ -8,11 +8,22 @@ module CF::App
           :singular => :app, :from_given => by_name(:app)
     input :debug_mode, :desc => "Debug mode to start in", :aliases => "-d"
     input :all, :desc => "Restart all applications", :default => false
+
+    ############# Uncomment to complete 50543607
+    #input :command, :desc => "Command to restart application", :default => nil
+
     def restart
       invoke :stop, :all => input[:all], :apps => input[:apps]
 
       line unless quiet?
 
+      input[:apps].each do |app|
+        unless input[:command].nil?
+          app.command = input[:command]
+        end
+        app.update!
+      end
+
       invoke :start, :all => input[:all], :apps => input[:apps],
         :debug_mode => input[:debug_mode]
     end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "3.0.1.rc1".freeze
+  VERSION = "3.1.0.rc1".freeze
 end

data/lib/manifests/manifests.rb

@@ -149,7 +149,8 @@ module CFManifests
       "name" => app.name,
       "memory" => human_size(app.memory * 1024 * 1024, 0),
       "instances" => app.total_instances,
-      "url" => app.url ? app.url.sub(target_base, '${target-base}') : "none",
+      "host" => app.host,
+      "domain" => app.domain,
       "path" => path
     }
 

data/lib/manifests/plugin.rb

@@ -10,7 +10,7 @@ class ManifestsPlugin < CF::App::Base
 
 
   [ :start, :restart, :instances, :logs, :env, :health, :stats,
-    :scale, :app, :stop, :delete
+    :scale, :app, :stop, :delete, :events
   ].each do |wrap|
     name_made_optional = change_argument(wrap, :app, :optional)
 

data/spec/cf/cli/app/events_spec.rb

@@ -0,0 +1,72 @@
+require "spec_helper"
+
+module CF
+  module App
+    describe Events do
+      let(:global) { {} }
+      let(:given) { {} }
+      let(:inputs) { {:app => apps[0]} }
+      let(:apps) { [build(:app)] }
+
+      before do
+        inputs[:app].stub(:events) do
+          [double("AppEvent", {
+            :instance_guid => "some_guid",
+            :instance_index => 1,
+            :exit_status => -1,
+            :exit_description => "Something very interesting",
+            :timestamp => "2013-05-15 18:52:17 +0000" }),
+          double("AppEvent", {
+            :instance_guid => "some_other_guid",
+            :instance_index => 0,
+            :exit_status => 0,
+            :exit_description => "Something less interesting",
+            :timestamp => "2013-05-15 18:52:15 +0000" })]
+        end
+      end
+
+      subject do
+        capture_output { Mothership.new.invoke(:events, inputs, given, global) }
+      end
+
+      describe "metadata" do
+        let(:command) { Mothership.commands[:events] }
+
+        describe "command" do
+          subject { command }
+          its(:description) { should eq "Display application events" }
+          it { expect(Mothership::Help.group(:apps, :info)).to include(subject) }
+        end
+
+        include_examples "inputs must have descriptions"
+
+        describe "arguments" do
+          subject { command.arguments }
+          it "has arguments that are not needed with a manifest" do
+            should eq([:name => :app, :type => :optional, :value => nil])
+          end
+        end
+      end
+
+      it "prints out progress" do
+        subject
+        stdout.rewind
+        expect(stdout.readlines.first).to match /Getting events for #{apps.first.name}/
+      end
+
+      it "prints out headers" do
+        subject
+        stdout.rewind
+        expect(stdout.readlines[2]).to match /time\s+instance\s+index\s+description\s+exit\s+status/
+      end
+
+      it "prints out the events in order" do
+        subject
+        stdout.rewind
+        expect(stdout.readlines[3]).to match /.*2013-05-15 18:52:15 \+0000\s+0\s+Something less interesting\s+Success \(0\).*/
+        stdout.rewind
+        expect(stdout.readlines[4]).to match /.*2013-05-15 18:52:17 \+0000\s+1\s+Something very interesting\s+Failure \(-1\).*/
+      end
+    end
+  end
+end

data/spec/cf/cli/app/restart_spec.rb

@@ -0,0 +1,47 @@
+require "spec_helper"
+
+module CF
+  module App
+    describe Restart do
+      let(:restart_command) { CF::App::Restart.new(Mothership.commands[:restart]) }
+      let(:inputs) { {:apps => [app]} }
+      let(:app) { build(:app, :command => "rails s") }
+
+      before do
+        restart_command.input = Mothership::Inputs.new(nil, restart_command, inputs, {}, {})
+        app.stub(:update!)
+      end
+
+      it "restarts the application" do
+        restart_command.should_receive(:invoke).with(:stop, anything) do
+          restart_command.should_receive(:invoke).with(:start, anything)
+        end
+        restart_command.restart
+      end
+
+      it "does not change the command if we do not pass the command argument" do
+        restart_command.stub(:invoke).with(:start, anything)
+        restart_command.stub(:invoke).with(:stop, anything)
+        restart_command.restart
+        app.command.should == "rails s"
+      end
+
+      context "when passing in a new start command" do
+        let(:inputs) { {:apps => [app], :command => 'rake db:migrate'} }
+
+        before do
+          restart_command.stub(:invoke).with(:stop, anything)
+          restart_command.input = Mothership::Inputs.new(nil, restart_command, inputs, {}, {})
+        end
+
+        it "updates the start command" do
+          app.should_receive(:update!) do
+            restart_command.should_receive(:invoke).with(:start, anything)
+          end
+          restart_command.restart
+          app.command.should == "rake db:migrate"
+        end
+      end
+    end
+  end
+end

data/spec/manifests/manifests_spec.rb

@@ -76,7 +76,9 @@ describe CFManifests do
     its(["memory"]) { should eq "2G" }
     its(["instances"]) { should eq 2 }
     its(["path"]) { should eq "some-path" }
-    its(["url"]) { should eq "some-app-name.${target-base}" }
+    #its(["url"]) { should eq "some-app-name.${target-base}" }
+    its(["host"]) { should eq "some-app-name" }
+    its(["domain"]) { should eq "${target-base}" }
     its(["command"]) { should eq "ruby main.rb" }
     its(["buildpack"]) { should eq "git://example.com/foo.git" }
 
@@ -114,7 +116,8 @@ describe CFManifests do
           :service_bindings => []
       }
 
-      its(["url"]) { should eq "none" }
+      its(["host"]) { should eq "none" }
+      its(["domain"]) { should eq "none" }
       it { should_not include "command" }
       it { should_not include "services" }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 3.0.1.rc1
+  version: 3.1.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.2.rc1
+        version: 2.2.0.rc1
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.2.rc1
+        version: 2.2.0.rc1
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -329,6 +329,7 @@ files:
 - lib/cf/cli/app/delete.rb
 - lib/cf/cli/app/deprecated.rb
 - lib/cf/cli/app/env.rb
+- lib/cf/cli/app/events.rb
 - lib/cf/cli/app/files.rb
 - lib/cf/cli/app/health.rb
 - lib/cf/cli/app/instances.rb
@@ -474,11 +475,13 @@ files:
 - spec/assets/rails328_ruby187_app/test/test_helper.rb
 - spec/cf/cli/app/base_spec.rb
 - spec/cf/cli/app/delete_spec.rb
+- spec/cf/cli/app/events_spec.rb
 - spec/cf/cli/app/instances_spec.rb
 - spec/cf/cli/app/push/create_spec.rb
 - spec/cf/cli/app/push/interactions_spec.rb
 - spec/cf/cli/app/push_spec.rb
 - spec/cf/cli/app/rename_spec.rb
+- spec/cf/cli/app/restart_spec.rb
 - spec/cf/cli/app/scale_spec.rb
 - spec/cf/cli/app/start_spec.rb
 - spec/cf/cli/app/stats_spec.rb
@@ -566,9 +569,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 428685765814888758
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -577,7 +577,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: cf
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
@@ -637,11 +637,13 @@ test_files:
 - spec/assets/rails328_ruby187_app/test/test_helper.rb
 - spec/cf/cli/app/base_spec.rb
 - spec/cf/cli/app/delete_spec.rb
+- spec/cf/cli/app/events_spec.rb
 - spec/cf/cli/app/instances_spec.rb
 - spec/cf/cli/app/push/create_spec.rb
 - spec/cf/cli/app/push/interactions_spec.rb
 - spec/cf/cli/app/push_spec.rb
 - spec/cf/cli/app/rename_spec.rb
+- spec/cf/cli/app/restart_spec.rb
 - spec/cf/cli/app/scale_spec.rb
 - spec/cf/cli/app/start_spec.rb
 - spec/cf/cli/app/stats_spec.rb