cf_script 0.0.1.beta.1 → 0.0.1

data/lib/cf_script/command/cf/spaces/spaces.rb

@@ -8,7 +8,7 @@ module CfScript::Command
 
     def run(*args, &block)
       run_cf self, *args do |output|
-        return unless can_run?(output)
+        return unless good_run?(output)
 
         if rows = output.table(SPACES_TABLE)
           spaces = rows.map { |row| row[:name].value }

data/lib/cf_script/command/runner.rb

@@ -71,27 +71,13 @@ module CfScript::Command
     def run_command(command, *args, &block)
       command_line = command.line(cf_env, cf_bin, args)
 
-      trace(:running, command_line.hide_sensitive, true)
+      trace(:running, command_line.hide_sensitive)
 
       stdout, stderr, status = cf_executor.execute(cf_env, command_line)
 
       output = CfScript::Output.new(command_line, stdout, stderr, status)
 
-      unless output.good?
-        run_error!(command_line, output)
-      end
-
       block_given? ? yield(output) : output
     end
-
-    def run_error!(command_line, output)
-      unless CfScript.stdout.is_a?(StringIO)
-        CfScript.stdout.puts output.stdout unless output.stdout.empty?
-      end
-
-      unless CfScript.stderr.is_a?(StringIO)
-        CfScript.stderr.puts output.stderr unless output.stderr.empty?
-      end
-    end
   end
 end

data/lib/cf_script/config.rb

@@ -45,12 +45,14 @@ class CfScript::Config
     attr_accessor :color
 
     attr_accessor :executor
+    attr_accessor :echo_output
 
     def initialize
       @trace = ENV['TRACE'] || false
       @color = true
 
-      @executor = ENV['NON_BLOCKING_EXECUTOR'] ? CfScript::Executor::NonBlocking.new : default_executor
+      @executor = default_executor
+      @echo_output = true
     end
 
     def default_executor

data/lib/cf_script/executor/recorder.rb

@@ -1,7 +1,9 @@
 class CfScript::Executor::Recorder
+  attr_reader :executions
+
   def initialize(executor = nil)
     @executions = []
-    @executor   = executor || CfScript::Executor::Simple.new
+    @executor   = executor || CfScript.config.runtime.executor
   end
 
   def execute(env, command_line)

data/lib/cf_script/executor/simple.rb

@@ -1,17 +1,30 @@
-require 'open3'
+require 'pty'
+require 'io/console'
 
 class CfScript::Executor::Simple
-  def initialize
-    @executions = 0
-  end
-
   def execute(env, command_line)
-    @executions += 1
+		out = ''
 
-    out, err, status = Open3.capture3(env, command_line.to_s)
+		PTY.spawn(command_line.to_s)do |i, o, pid|
+			begin
+				i.sync
+        i.raw!
 
-    puts if CfScript.config.runtime.trace
+				i.each_line do |line|
+          echo(line)
+					out << line
+				end
+			rescue Errno::EIO => e
+				# Ignored
+			ensure
+				::Process.wait pid
+			end
+		end
+
+    [out, '', $?]
+  end
 
-    [out, err, status]
+  def echo(line)
+    STDOUT.print line if CfScript.config.runtime.echo_output
   end
 end

data/lib/cf_script/executor.rb

@@ -2,4 +2,3 @@ CfScript.const_set(:Executor, Module.new)
 
 require 'cf_script/executor/recorder'
 require 'cf_script/executor/simple'
-require 'cf_script/executor/non_blocking'

data/lib/cf_script/object/api_endpoint.rb

@@ -1,4 +1,4 @@
-class CfScript::ApiEndpoint < CfScript::Object
+class CfScript::ApiEndpoint
   attr_reader :url
   attr_reader :version
 

data/lib/cf_script/object/app_info.rb

@@ -1,4 +1,4 @@
-class CfScript::AppInfo < CfScript::Object
+class CfScript::AppInfo
   # These are always available
   attr_reader :name
   attr_reader :requested_state

data/lib/cf_script/object/app_list.rb

@@ -1,4 +1,4 @@
-class CfScript::AppList < CfScript::Object
+class CfScript::AppList
   extend Forwardable
   include Enumerable
 
@@ -8,17 +8,33 @@ class CfScript::AppList < CfScript::Object
 
   def_delegators :@list, :<<, :[], :clear, :length, :each, :select
 
+  def names
+    @list.map(&:name)
+  end
+
+  def ==(other)
+    names == other.names
+  end
+
+  def each_name(&block)
+    names.each { |name| yield(name) }
+  end
+
   def select!(options)
-    if options[:starting_with]
-      @list.reject! { |app_info| app_info.name !~ /\A#{options[:starting_with]}/ }
+    if options[:matching]
+      @list.select! { |app_info| app_info.name =~ /#{options[:matching]}/ }
     end
 
-    if options[:state]
-      @list.reject! { |app_info| app_info.requested_state !~ /\A#{options[:state]}\z/ }
+    if options[:starting_with]
+      @list.reject! { |app_info| app_info.name !~ /\A#{options[:starting_with]}/ }
     end
 
     if options[:ending_with]
       @list.reject! { |app_info| app_info.name !~ /#{options[:ending_with]}\z/ }
     end
+
+    if options[:state]
+      @list.reject! { |app_info| app_info.requested_state !~ /\A#{options[:state]}\z/ }
+    end
   end
 end

data/lib/cf_script/object/attribute.rb

@@ -1,4 +1,4 @@
-class CfScript::Attribute < CfScript::Object
+class CfScript::Attribute
   attr_reader :name, :value
 
   def initialize(name, value)

data/lib/cf_script/object/attribute_list.rb

@@ -1,4 +1,4 @@
-class CfScript::AttributeList < CfScript::Object
+class CfScript::AttributeList
   extend Forwardable
   include Enumerable
 

data/lib/cf_script/object/instance_status.rb

@@ -1,4 +1,4 @@
-class CfScript::InstanceStatus < CfScript::Object
+class CfScript::InstanceStatus
   attr_reader :index
   attr_reader :state
   attr_reader :since

data/lib/cf_script/object/route_info.rb

@@ -1,4 +1,4 @@
-class CfScript::RouteInfo < CfScript::Object
+class CfScript::RouteInfo
   attr_reader :space
   attr_reader :host
   attr_reader :domain

data/lib/cf_script/object/space.rb

@@ -1,4 +1,4 @@
-class CfScript::Space < CfScript::Object
+class CfScript::Space
   attr_reader :name
   attr_reader :org
   attr_reader :apps

data/lib/cf_script/object/target.rb

@@ -1,4 +1,4 @@
-class CfScript::Target < CfScript::Object
+class CfScript::Target
   attr_reader   :api_endpoint
   attr_reader   :user
   attr_reader   :org

data/lib/cf_script/object.rb

@@ -1,21 +1,10 @@
 require 'ostruct'
 require 'forwardable'
 
-class CfScript::Object
-  class << self
-    attr_reader :_cf_script_object_count
-  end
-
-  def initialize
-    @@_cf_script_object_count += 1
-  end
-end
-
 require 'cf_script/object/attribute'
 require 'cf_script/object/attribute_list'
 
 require 'cf_script/object/api_endpoint'
-require 'cf_script/object/app_spec'
 require 'cf_script/object/app_info'
 require 'cf_script/object/app_list'
 require 'cf_script/object/instance_status'

data/lib/cf_script/output/buffer.rb

@@ -17,7 +17,7 @@ module CfScript
     end
 
     def last_line
-      lines.last
+      lines.reject(&:empty?).last
     end
 
     def [](arg)

data/lib/cf_script/scope/app/routes.rb

@@ -3,7 +3,7 @@ module CfScript::Scope
     def has_route?(domain, host = nil)
       route = [host, domain].compact.join('.')
 
-      urls.split(', ').include?(route)
+      urls.include?(route)
     end
 
     def map_route(domain, host =  nil)

data/lib/cf_script/scope/app.rb

@@ -6,10 +6,8 @@ module CfScript::Scope
 
     attr_reader :name
     attr_reader :app_info
-   #attr_reader :app_spec
     attr_reader :current_target
 
-   #include CfScript::Callbacks
     include CfScript::UI
     include CfScript::UI::NameTag
 
@@ -20,11 +18,9 @@ module CfScript::Scope
       when String, Symbol
         @name     = name_or_info
         @app_info = nil
-       #@app_spec = spec_for(name)
       when CfScript::AppInfo
         @name     = name_or_info.name
         @app_info = name_or_info
-       #@app_spec = spec_for(name)
       else
         raise "App accepts a name (String or Symbol) or an AppInfo object, " +
               "but a #{name_or_info.class.name} was given"
@@ -49,28 +45,6 @@ module CfScript::Scope
       "#{current_target.space}:#{name}"
     end
 
-   #def run_callbacks(stage, command)
-   #  return unless app_spec
-
-   #  app_spec.callbacks_for(stage, command).each do |callback|
-   #    self.instance_eval(&callback)
-   #  end
-   #end
-
-   #def callbacks_before(command)
-   #  run_callbacks(:before, command)
-   #end
-
-   #def callbacks_after(command)
-   #  run_callbacks(:after, command)
-   #end
-
-   #def callbacks_around(command, &block)
-   #  run_callbacks(:before, command)
-   #  self.instance_eval(&block)
-   #  run_callbacks(:after, command)
-   #end
-
     private
 
     def cf_self

data/lib/cf_script/scope/target.rb

@@ -52,7 +52,13 @@ module CfScript::Scope
 
       apps.select!(options) unless options.empty?
 
-      block_given? ? yield(apps) : apps
+      if block_given?
+        apps.each do |app_info|
+          app(app_info, &block)
+        end
+      else
+        apps
+      end
     end
 
     private

data/lib/cf_script/ui.rb

@@ -43,7 +43,7 @@ module CfScript::UI
 
     default:  "\xE2\x9E\x96",
 
-    bisque:   "🍲",
+    lobster_bisque:   "🍲", # h/t @dbelloti
   }
 
   module_function
@@ -72,10 +72,6 @@ module CfScript::UI
     COLORS[CfScript.config.ui.color ? type : :default]
   end
 
-  def ui_style(text, type = :default)
-    text.colorize with_color_of(type)
-  end
-
   def emoji(type)
     "#{(EMOJI.key?(type) ? EMOJI[type] : EMOJI[:default])} "
   end
@@ -105,7 +101,7 @@ module CfScript::UI
   end
 
   def tag_format(tag, type = :default)
-    if tag and CfScript.config.ui.tags
+    if tag && CfScript.config.ui.tags
       list = []
 
       list << tag_open(type)

data/lib/cf_script/version.rb

@@ -1,3 +1,3 @@
 module CfScript
-  VERSION = '0.0.1.beta.1'
+  VERSION = '0.0.1'
 end

data/lib/cf_script.rb

@@ -1,6 +1,5 @@
 require_relative './cf_script/version'
 require_relative './cf_script/config'
-require_relative './cf_script/callbacks'
 require_relative './cf_script/utils'
 require_relative './cf_script/ui'
 require_relative './cf_script/output'
@@ -20,7 +19,6 @@ module CfScript
     attr_accessor :cf_call_stack
   end
 
- #extend CfScript::Context
   extend CfScript::Scope::Execution
   extend CfScript::UI
 

data/test/fixtures/commands/apps/delete/good.yml

@@ -0,0 +1,8 @@
+---
+stdout: |
+  Deleting app worker in org ACME / space development as user@example.com...
+  OK
+
+stderr: ''
+status:
+  exitstatus: 0

data/test/fixtures/commands/apps/delete/not_exist.yml

@@ -0,0 +1,9 @@
+---
+stdout: |
+  Deleting app worker in org ACME / space development as user@example.com...
+  OK
+  App worker does not exist.
+
+stderr: ''
+status:
+  exitstatus: 0

data/test/fixtures/commands/apps/rename/good.yml

@@ -0,0 +1,8 @@
+---
+stdout: |
+  Renaming app old-name to new-name in org ACME / space development as user@example.com...
+  OK
+
+stderr: ''
+status:
+  exitstatus: 0

data/test/fixtures/commands/apps/rename/not_found.yml

@@ -0,0 +1,8 @@
+---
+stdout: |
+  FAILED
+  App bogus not found
+
+stderr: ''
+status:
+  exitstatus: 0

data/test/lib/cf_script/command/cf/apps/app_test.rb

@@ -33,6 +33,14 @@ describe 'AppCommand' do
     end
   end
 
+  it "returns nil if no attributes were found" do
+    fake_cf app: :empty do
+      result = command.run(:worker)
+
+      assert_equal nil, result
+    end
+  end
+
   it "returns nil when the app is not found" do
     fake_cf app: :not_found do
       assert_equal nil, command.run(:api)

data/test/lib/cf_script/command/cf/apps/apps_test.rb

@@ -8,7 +8,7 @@ describe 'AppsCommand' do
   it_behaves_like 'a command object that', {
     has_type:  :apps,
     has_name:  :apps,
-    fails_with: []
+    fails_with: CfScript::AppList.new # an empty AppList
   }
 
   it "returns an AppList object" do
@@ -70,12 +70,21 @@ describe 'AppsCommand' do
     end
   end
 
+  it "returns an empty AppList for empty output" do
+    fake_cf apps: :empty do
+      apps = command.run
+
+      assert_instance_of CfScript::AppList, apps
+      assert_equal CfScript::AppList.new, apps
+    end
+  end
+
   it "returns an empty Array when no apps are found" do
     fake_cf apps: :no_apps do
       apps = command.run
 
-      assert_instance_of Array, apps
-      assert_equal [], apps
+      assert_instance_of CfScript::AppList, apps
+      assert_equal CfScript::AppList.new, apps
     end
   end
 end

data/test/lib/cf_script/command/cf/apps/delete_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+
+describe 'DeleteCommand' do
+  include MockExecution
+
+  let(:command) { CfScript::Command::Apps::DeleteCommand.instance }
+
+  it_behaves_like 'a command object that', {
+    has_type:  :apps,
+    has_name:  :delete,
+    fails_with: false
+  }
+
+  it "returns true on success" do
+    fake_cf do
+      assert_equal true, command.run(:name)
+    end
+  end
+
+  it "prints an error on failure" do
+    fake_cf delete: :not_exist do |stdout, stderr|
+      command.run(:name)
+
+      assert_match /\{delete\} failed to delete app/, stderr.lines.first
+    end
+  end
+
+  it "skips flags when false" do
+    assert_command_args command,
+      [:worker],
+      [:worker, { flags: [] }]
+  end
+
+  it "adds flag for force when true" do
+    assert_command_args command,
+      [:worker, true],
+      [:worker, { flags: [:f] }]
+  end
+
+  it "adds flag for delete routes when true" do
+    assert_command_args command,
+      [:worker, false, true],
+      [:worker, { flags: [:r] }]
+  end
+
+  it "adds flags for force and delete routes when true" do
+    assert_command_args command,
+      [:worker, true, true],
+      [:worker, { flags: [:f, :r] }]
+  end
+end

data/test/lib/cf_script/command/cf/apps/env_test.rb

@@ -47,9 +47,19 @@ describe 'EnvCommand' do
     end
   end
 
-  it "returns an empty Hash when no env variables are found" do
+  it "returns an empty Hash if the output is empty" do
     fake_cf env: :empty do
-      assert_equal({}, command.run(:worker))
+      result = command.run(:worker)
+
+      assert_equal({}, result)
+    end
+  end
+
+  it "returns an empty Hash when no env variables are found" do
+    fake_cf env: :empty_vars do
+      result = command.run(:worker)
+
+      assert_equal({}, result)
     end
   end
 end

data/test/lib/cf_script/command/cf/apps/push_test.rb

@@ -19,6 +19,14 @@ describe 'PushCommand' do
     end
   end
 
+  it "returns nil if no attributes were found" do
+    fake_cf push: :empty do
+      result = command.run(:api)
+
+      assert_equal nil, result
+    end
+  end
+
   it "translates long option names to cf's short ones" do
     fake_cf do
       assert_equal({ f: 'a' }, command.translate_options({ manifest: 'a' }))
@@ -43,4 +51,10 @@ describe 'PushCommand' do
       )
     end
   end
+
+  it "builds options and flag for run_cf" do
+    assert_command_args command,
+      [:worker, i: 2, memory: '123', command: './run', flags: [:no_start]],
+      [:worker, { i: 2, m: '123', c: './run', flags: [:no_start] }]
+  end
 end

data/test/lib/cf_script/command/cf/apps/rename_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+describe 'RenameCommand' do
+  include MockExecution
+
+  let(:command) { CfScript::Command::Apps::RenameCommand.instance }
+
+  it_behaves_like 'a command object that', {
+    has_type:  :apps,
+    has_name:  :rename,
+    fails_with: false
+  }
+
+  it "returns true on success" do
+    fake_cf do
+      assert_equal true, command.run(:old, :new)
+    end
+  end
+
+  it "prints an error on failure" do
+    fake_cf rename: :not_found do |stdout, stderr|
+      command.run(:old, :new)
+
+      assert_match /\{rename\} failed to rename/, stderr.lines.first
+    end
+  end
+
+  it "returns false when the app is not found" do
+    fake_cf rename: :not_found do |stdout, stderr|
+      assert_equal false, command.run(:old, :new)
+
+      assert_match /\{rename\} failed to rename/, stderr.lines.first
+    end
+  end
+end

data/test/lib/cf_script/command/cf/apps/restage_test.rb

@@ -39,6 +39,14 @@ describe 'RestageCommand' do
     end
   end
 
+  it "returns nil if no attributes were found" do
+    fake_cf restage: :empty do
+      result = command.run(:api)
+
+      assert_equal nil, result
+    end
+  end
+
   it "returns nil on failure" do
     fake_cf restage: :not_found do
       assert_equal nil, command.run(:some_app)

data/test/lib/cf_script/command/cf/apps/restart_test.rb

@@ -39,6 +39,14 @@ describe 'RestartCommand' do
     end
   end
 
+  it "returns nil if no attributes were found" do
+    fake_cf restart: :empty do
+      result = command.run(:worker)
+
+      assert_equal nil, result
+    end
+  end
+
   it "returns nil on failure" do
     fake_cf restart: :not_found do
       assert_equal nil, command.run(:some_app)

data/test/lib/cf_script/command/cf/apps/start_test.rb

@@ -47,6 +47,14 @@ describe 'StartCommand' do
     end
   end
 
+  it "returns nil if no attributes were found" do
+    fake_cf start: :empty do
+      result = command.run(:worker)
+
+      assert_equal nil, result
+    end
+  end
+
   it "returns nil on failure" do
     fake_cf start: :not_found do
       assert_equal nil, command.run(:some_app)

data/test/lib/cf_script/command/cf/apps/stop_test.rb

@@ -13,7 +13,7 @@ describe 'StopCommand' do
 
   it "returns true on success" do
     fake_cf do
-      assert command.run(:worker)
+      assert_equal true, command.run(:worker)
     end
   end
 
@@ -27,7 +27,7 @@ describe 'StopCommand' do
 
   it "returns false when the app is not found" do
     fake_cf stop: :not_found do |stdout, stderr|
-      refute command.run(:bogus)
+      assert_equal false, command.run(:bogus)
 
       assert_match /\{stop\} failed to stop/, stderr.lines.first
     end