cf_script 0.0.1.beta.1 → 0.0.1

data/test/lib/cf_script/scope/target_test.rb

@@ -17,8 +17,8 @@ describe CfScript::Scope::Target do
     initial_target = subject.instance_variable_get('@initial_target')
     current_target = subject.instance_variable_get('@current_target')
 
-    assert initial_target
-    assert current_target
+    assert initial_target, "Expected @initial_target to be set"
+    assert current_target, "Expected @current_target to be set"
 
     assert_instance_of CfScript::Target, initial_target
     assert_instance_of CfScript::Target, current_target
@@ -36,6 +36,7 @@ describe CfScript::Scope::Target do
       assert_equal 'ACME',    subject.current_org
 
       subject.target(:production)
+
       assert_equal 'production', subject.current_space
       assert_equal 'ACME',       subject.current_org
     end
@@ -44,10 +45,12 @@ describe CfScript::Scope::Target do
   it "resets target to initial_target if the space has changed" do
     fake_cf target: :production do
       subject.target(:production)
+
       assert_equal 'production', subject.current_space
       assert_equal 'ACME',       subject.current_org
 
       subject.finalize
+
       assert_equal 'staging', subject.current_space
       assert_equal 'ACME',    subject.current_org
     end
@@ -56,17 +59,20 @@ describe CfScript::Scope::Target do
   it "resets target to initial_target if the org has changed" do
     fake_cf do
       subject.target(:staging_org)
+
       assert_equal 'staging', subject.current_space
       assert_equal 'ORG',     subject.current_org
 
       subject.finalize
+
       assert_equal 'staging', subject.current_space
       assert_equal 'ACME',    subject.current_org
     end
   end
 
   it "responds to target without args and calls Command.run" do
-    assert subject.respond_to?(:target)
+    assert subject.respond_to?(:target),
+      "Expected Scope::Target to respond to target"
 
     CfScript::Command.stub :run, :called do
       assert_equal :called, subject.target
@@ -74,8 +80,6 @@ describe CfScript::Scope::Target do
   end
 
   it "responds to target with a space name and calls Command.run if not == current" do
-    assert subject.respond_to?(:target)
-
     assert_equal 'staging', subject.current_space
 
     CfScript::Command.stub :run, :called do
@@ -92,7 +96,8 @@ describe CfScript::Scope::Target do
   end
 
   it "responds to space and calls Command.run" do
-    assert subject.respond_to?(:space)
+    assert subject.respond_to?(:space),
+      "Expected Scope::Target to respond to space"
 
     CfScript::Command.stub :run, :called do
       assert_equal :called, subject.space(:foo)
@@ -100,8 +105,6 @@ describe CfScript::Scope::Target do
   end
 
   it "responds to space with a block and calls exec_in with a Space scope" do
-    assert subject.respond_to?(:space)
-
     arg_catcher = lambda do |scope, args, &block|
       assert_instance_of CfScript::Scope::Space, scope
     end
@@ -114,7 +117,8 @@ describe CfScript::Scope::Target do
   end
 
   it "responds to app and calls Command.run" do
-    assert subject.respond_to?(:app)
+    assert subject.respond_to?(:app),
+      "Expected Scope::Target to respond to app"
 
     CfScript::Command.stub :run, :called do
       assert_equal :called, subject.app(:foo)
@@ -122,8 +126,6 @@ describe CfScript::Scope::Target do
   end
 
   it "responds to app with a block and calls exec_in with an App scope" do
-    assert subject.respond_to?(:app)
-
     arg_catcher = lambda do |scope, args, &block|
       assert_instance_of CfScript::Scope::App, scope
     end
@@ -135,24 +137,37 @@ describe CfScript::Scope::Target do
     end
   end
 
-  it "responds to apps and calls Command.run" do
-    assert subject.respond_to?(:apps)
+  describe 'apps' do
+    it "calls Command.run" do
+      assert subject.respond_to?(:apps),
+        "Expected Scope::Target to respond to apps"
 
-    CfScript::Command.stub :run, :called do
-      assert_equal :called, subject.apps
+      CfScript::Command.stub :run, :called do
+        assert_equal :called, subject.apps
+      end
     end
-  end
 
-  it "calls apps.select! when options is not empty" do
-    assert subject.respond_to?(:apps)
+    it "calls apps.select! when options are given" do
+      apps = MiniTest::Mock.new
+      apps.expect(:org, nil, [])
+      apps.expect(:org, nil, [])
+      apps.expect(:space, nil, [])
+      apps.expect(:space, nil, [])
+      apps.expect(:select!, nil, [{ ending_with: :foo }])
 
-    apps = MiniTest::Mock.new
-    apps.expect(:select!, apps, [{ ending_with: :foo }])
+      CfScript::Command.stub :run, apps do
+        subject.apps(ending_with: :foo)
+      end
 
-    CfScript::Command.stub :run, apps do
-      subject.apps(ending_with: :foo)
+      apps.verify
     end
 
-    apps.verify
+    it "executes given block within each app's scope" do
+      fake_cf do
+        subject.apps do
+          assert_instance_of CfScript::Scope::App, self
+        end
+      end
+    end
   end
 end

data/test/lib/cf_script/scope_test.rb

@@ -12,11 +12,13 @@ describe CfScript::Scope do
   end
 
   it "calls enter_scope on initialize" do
-    assert ScopeTest.new.called_enter_scope
+    assert ScopeTest.new.called_enter_scope,
+      "Expected enter_scope to have been called"
   end
 
   it "responds to finalize which calls exit_scope" do
-    assert subject.respond_to?(:finalize)
+    assert subject.respond_to?(:finalize),
+      "Expected Scope::Base to respond to finalize"
 
     subject.stub :exit_scope, 'foo' do
       assert_equal 'foo', subject.finalize
@@ -24,15 +26,17 @@ describe CfScript::Scope do
   end
 
   it "responds to spec_for and calls CfScript.spec_for" do
-    assert subject.respond_to?(:spec_for)
+    assert subject.respond_to?(:spec_for),
+      "Expected Scope::Base to respond to spec_for"
 
-    CfScript.stub :spec_for, 'called' do
-      assert_equal 'called', subject.spec_for(:app)
+    CfScript.stub :spec_for, :called do
+      assert_equal :called, subject.spec_for(:app)
     end
   end
 
   it "responds to method_missing and calls Command.run" do
-    assert subject.respond_to?(:method_missing)
+    assert subject.respond_to?(:method_missing),
+      "Expected Scope::Base to respond to method_missing"
 
     CfScript::Command.stub :run, 'pong' do
       assert_equal 'pong', subject.ping

data/test/lib/cf_script/ui_test.rb

@@ -0,0 +1,133 @@
+require 'test_helper'
+
+describe CfScript::UI do
+  include MockExecution
+
+  subject { CfScript::UI }
+
+  it "defines a puts_out method that outputs to the configured stdout" do
+    fake_io do |out, err|
+      subject.puts_out 'foo bar'
+
+      assert_equal "foo bar\n", out.lines.first
+      assert_equal true, err.lines.empty?
+    end
+  end
+
+  it "defines a print_out method that outputs to the configured stdout" do
+    fake_io do |out, err|
+      subject.print_out 'foo bar'
+
+      assert_equal "foo bar", out.lines.first
+      assert_equal true, err.lines.empty?
+    end
+  end
+
+  it "defines a puts_err method that outputs to the configured stderr" do
+    fake_io do |out, err|
+      subject.puts_err 'foo bar'
+
+      assert_equal true, out.lines.empty?
+      assert_equal "foo bar\n", err.lines.first
+    end
+  end
+
+  it "defines a print_err method that outputs to the configured stderr" do
+    fake_io do |out, err|
+      subject.print_err 'foo bar'
+
+      assert_equal true, out.lines.empty?
+      assert_equal "foo bar", err.lines.first
+    end
+  end
+
+  describe "with_color_of" do
+    it "returns default color by default" do
+      color = subject.with_color_of
+
+      assert_equal({ color: :default }, color)
+    end
+
+    it "returns color for given type" do
+      color = subject.with_color_of(:error)
+
+      assert_equal({ color: :red }, color)
+    end
+  end
+
+  describe "tag_char" do
+    it "returns default character for unknown type" do
+      char = subject.tag_char(:bogus, :first)
+
+      assert_equal '[', char
+    end
+
+    it "returns character for given type" do
+      char = subject.tag_char(:error, :last)
+
+      assert_equal '}', char
+    end
+  end
+
+  describe "tag_open/tag_close" do
+    it "return first and last characters for type" do
+      open_char  = subject.tag_open(:other)
+      close_char = subject.tag_close(:other)
+
+      assert_equal '[', open_char
+      assert_equal ']', close_char
+    end
+  end
+
+  describe "emoji_for" do
+    it "returns nil if config.ui.emoji is false" do
+      with_config do
+        emoji = subject.emoji_for(:success)
+
+        assert_equal nil, emoji
+      end
+    end
+
+    it "returns emoji character if config.ui.emoji is true" do
+      with_config emoji: true do
+        emoji = subject.emoji_for(:success)
+
+        assert_equal [9989, 32], emoji.codepoints
+      end
+    end
+  end
+
+  describe "tag_format" do
+    it "returns nil if config.ui.tags is false" do
+      with_config tags: false do
+        tag = subject.tag_format('foo', :trace)
+
+        assert_equal nil, tag
+      end
+    end
+
+    it "returns nil if the tag is nil" do
+      with_config tags: true do
+        tag = subject.tag_format(nil, :trace)
+
+        assert_equal nil, tag
+      end
+    end
+
+    it "returns formatted tag if tag is given and config.ui.tags is true" do
+      with_config tags: true, color: true do
+        tag = subject.tag_format('foo', :trace)
+
+        assert_equal "\e[0;90;49m<foo>\e[0m", tag
+      end
+    end
+  end
+
+  describe "ui_format" do
+    it "returns a formatted message" do
+      text = subject.ui_format(:success, 'foo', 'bar')
+
+      assert_equal "\e[0;32;49m[foo]\e[0m \e[0;32;49mbar\e[0m", text
+    end
+  end
+end

data/test/lib/cf_script_test.rb

@@ -4,7 +4,7 @@ describe CfScript do
   include MockExecution
 
   it "defines a config method that returns the Config object" do
-    assert CfScript.respond_to? :config
+    assert CfScript.respond_to? :config, "Expected CfScript to respond to config"
 
     config = CfScript.config
 
@@ -13,7 +13,7 @@ describe CfScript do
   end
 
   it "defines a configure method that yields the Config object" do
-    assert CfScript.respond_to? :configure
+    assert CfScript.respond_to? :configure, "Expected CfScript to respond to configure"
 
     called = false
 
@@ -28,10 +28,10 @@ describe CfScript do
   end
 
   it "defines stdout/stderr methods that return the configured IO objects" do
-    assert CfScript.respond_to? :stdout
+    assert CfScript.respond_to? :stdout, "Expected CfScript to respond to stdout"
     assert_same CfScript.config.io.stdout, CfScript.stdout
 
-    assert CfScript.respond_to? :stderr
+    assert CfScript.respond_to? :stderr, "Expected CfScript to respond to stderr"
     assert_same CfScript.config.io.stderr, CfScript.stderr
   end
 
@@ -64,10 +64,16 @@ describe CfScript do
   end
 
   it "doesn't expose private methods" do
-    refute CfScript.respond_to?(:stack_level)
-    assert CfScript.singleton_class.private_method_defined?(:stack_level)
+    refute CfScript.respond_to?(:stack_level),
+      "Expected CfScript not to respond to stack_level"
 
-    refute CfScript.respond_to?(:print_error)
-    assert CfScript.singleton_class.private_method_defined?(:print_error)
+    assert CfScript.singleton_class.private_method_defined?(:stack_level),
+      "Expected CfScript singleton to respond to stack_level"
+
+    refute CfScript.respond_to?(:print_error),
+      "Expected CfScript not to respond to print_error"
+
+    assert CfScript.singleton_class.private_method_defined?(:print_error),
+      "Expected CfScript singleton to respond to print_error"
   end
 end

data/test/support/assertions.rb

@@ -12,3 +12,28 @@ def assert_app_info(app_info, expected_instances)
     end
   end
 end
+
+# Asserts that a command correctly prepares its arguments for passing to
+# run_cf and in turn to the cf binary. call_args is an array of the args
+# to be passed to the command's run method, and run_args is an array of
+# the args expected to be passed to run_cf.
+def assert_command_args(command, call_args, run_args)
+  output = CfScript::Output.new(command, '', '',
+    OpenStruct.new(
+      exitstatus: 0,
+      success?:   true,
+    )
+  )
+
+  arg_catcher = lambda do |cmd, *args, &block|
+    assert_equal run_args, args
+  end
+
+  fake_cf do
+    command.stub :run_cf, arg_catcher, output do
+      command.stub :good_run?, true do
+        command.run(*call_args)
+      end
+    end
+  end
+end

data/test/support/helpers/fixture_executor.rb

@@ -27,7 +27,7 @@ class FixtureExecutor
 
   def fixture_for(command_line)
     case @command_fixtures[command_line.name]
-    when :fail, :no_endpoint, :no_login
+    when :fail, :no_endpoint, :no_login, :empty
       dir = File.join('commands', 'common')
       key = @command_fixtures[command_line.name]
     else

data/test/support/helpers/mock_execution.rb

@@ -5,13 +5,25 @@ module MockExecution
     ENV['CF_BINARY'] = 'cf'
   end
 
-  def test_config(config = {})
-    CfScript.config.io.stdout     = config[:stderr] || StringIO.new
-    CfScript.config.io.stderr     = config[:stderr] || StringIO.new
+  def test_config(options = {})
+    CfScript.config.io.stdout = options[:stderr] || StringIO.new
+    CfScript.config.io.stderr = options[:stderr] || StringIO.new
 
-    CfScript.config.ui.color      = config[:color]  || false
+    CfScript.config.ui.tags  = options.key?(:tags)  ? options[:tags]  : true
+    CfScript.config.ui.color = options.key?(:color) ? options[:color] : false
+    CfScript.config.ui.emoji = options.key?(:emoji) ? options[:emoji] : false
 
-    CfScript.config.runtime.trace = config[:trace]  || true
+    CfScript.config.runtime.trace = options.key?(:trace) ? options[:trace] : true
+  end
+
+  def with_config(config_options = {}, &block)
+    config_context = ConfigContext.new
+
+    test_config(config_options)
+
+    yield
+  ensure
+    config_context.reset
   end
 
   def test_executor(executor)
@@ -44,8 +56,18 @@ module MockExecution
     end
   end
 
+  def fake_io(config_options = {}, &block)
+    config_context = ConfigContext.new
+
+    test_config(config_options)
+
+    yield(CfScript.stdout.string, CfScript.stderr.string)
+  ensure
+    config_context.reset
+  end
+
   def fake_cf(command_fixtures = {}, &block)
-    config = ConfigContext.new
+    config_context = ConfigContext.new
 
     test_env
     test_config
@@ -53,6 +75,6 @@ module MockExecution
 
     yield(CfScript.stdout.string, CfScript.stderr.string)
   ensure
-    config.reset
+    config_context.reset
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_script
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.1
+  version: 0.0.1
 platform: ruby
 authors:
 - Ammar Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -39,14 +40,15 @@ files:
 - Rakefile
 - cf_script.gemspec
 - lib/cf_script.rb
-- lib/cf_script/callbacks.rb
 - lib/cf_script/command.rb
 - lib/cf_script/command/base.rb
 - lib/cf_script/command/cf/apps.rb
 - lib/cf_script/command/cf/apps/app.rb
 - lib/cf_script/command/cf/apps/apps.rb
+- lib/cf_script/command/cf/apps/delete.rb
 - lib/cf_script/command/cf/apps/env.rb
 - lib/cf_script/command/cf/apps/push.rb
+- lib/cf_script/command/cf/apps/rename.rb
 - lib/cf_script/command/cf/apps/restage.rb
 - lib/cf_script/command/cf/apps/restart.rb
 - lib/cf_script/command/cf/apps/set_env.rb
@@ -75,7 +77,6 @@ files:
 - lib/cf_script/command/runner.rb
 - lib/cf_script/config.rb
 - lib/cf_script/executor.rb
-- lib/cf_script/executor/non_blocking.rb
 - lib/cf_script/executor/recorder.rb
 - lib/cf_script/executor/simple.rb
 - lib/cf_script/manifest.rb
@@ -83,7 +84,6 @@ files:
 - lib/cf_script/object/api_endpoint.rb
 - lib/cf_script/object/app_info.rb
 - lib/cf_script/object/app_list.rb
-- lib/cf_script/object/app_spec.rb
 - lib/cf_script/object/attribute.rb
 - lib/cf_script/object/attribute_list.rb
 - lib/cf_script/object/instance_status.rb
@@ -116,14 +116,17 @@ files:
 - test/fixtures/commands/apps/app/running.yml
 - test/fixtures/commands/apps/apps/good.yml
 - test/fixtures/commands/apps/apps/no_apps.yml
-- test/fixtures/commands/apps/env/empty.yml
+- test/fixtures/commands/apps/delete/good.yml
+- test/fixtures/commands/apps/delete/not_exist.yml
+- test/fixtures/commands/apps/env/empty_vars.yml
 - test/fixtures/commands/apps/env/good.yml
 - test/fixtures/commands/apps/push/good.yml
+- test/fixtures/commands/apps/rename/good.yml
+- test/fixtures/commands/apps/rename/not_found.yml
 - test/fixtures/commands/apps/restage/good.yml
 - test/fixtures/commands/apps/restage/not_found.yml
 - test/fixtures/commands/apps/restart/good.yml
 - test/fixtures/commands/apps/restart/not_found.yml
-- test/fixtures/commands/apps/set_env/empty.yml
 - test/fixtures/commands/apps/set_env/good.yml
 - test/fixtures/commands/apps/set_env/not_found.yml
 - test/fixtures/commands/apps/start/good.yml
@@ -131,9 +134,9 @@ files:
 - test/fixtures/commands/apps/start/with_container.yml
 - test/fixtures/commands/apps/stop/good.yml
 - test/fixtures/commands/apps/stop/not_found.yml
-- test/fixtures/commands/apps/unset_env/empty.yml
 - test/fixtures/commands/apps/unset_env/good.yml
 - test/fixtures/commands/apps/unset_env/not_found.yml
+- test/fixtures/commands/common/empty.yml
 - test/fixtures/commands/common/fail.yml
 - test/fixtures/commands/common/no_endpoint.yml
 - test/fixtures/commands/common/no_login.yml
@@ -142,13 +145,11 @@ files:
 - test/fixtures/commands/general/api/good.yml
 - test/fixtures/commands/general/api/not_set.yml
 - test/fixtures/commands/general/api/set.yml
-- test/fixtures/commands/general/auth/empty.yml
 - test/fixtures/commands/general/auth/good.yml
 - test/fixtures/commands/general/auth/rejected.yml
 - test/fixtures/commands/general/login/good.yml
 - test/fixtures/commands/general/login/rejected.yml
 - test/fixtures/commands/general/logout/good.yml
-- test/fixtures/commands/general/target/empty.yml
 - test/fixtures/commands/general/target/good.yml
 - test/fixtures/commands/general/target/no_space.yml
 - test/fixtures/commands/general/target/not_found.yml
@@ -172,16 +173,16 @@ files:
 - test/fixtures/commands/routes/unmap_route/good.yml
 - test/fixtures/commands/routes/unmap_route/no_app.yml
 - test/fixtures/commands/routes/unmap_route/no_domain.yml
-- test/fixtures/commands/spaces/space/empty.yml
 - test/fixtures/commands/spaces/space/good.yml
 - test/fixtures/commands/spaces/space/staging.yml
-- test/fixtures/commands/spaces/spaces/empty.yml
 - test/fixtures/commands/spaces/spaces/good.yml
 - test/lib/cf_script/command/base_test.rb
 - test/lib/cf_script/command/cf/apps/app_test.rb
 - test/lib/cf_script/command/cf/apps/apps_test.rb
+- test/lib/cf_script/command/cf/apps/delete_test.rb
 - test/lib/cf_script/command/cf/apps/env_test.rb
 - test/lib/cf_script/command/cf/apps/push_test.rb
+- test/lib/cf_script/command/cf/apps/rename_test.rb
 - test/lib/cf_script/command/cf/apps/restage_test.rb
 - test/lib/cf_script/command/cf/apps/restart_test.rb
 - test/lib/cf_script/command/cf/apps/set_env_test.rb
@@ -216,12 +217,15 @@ files:
 - test/lib/cf_script/output/parser/table_test.rb
 - test/lib/cf_script/output/tests_test.rb
 - test/lib/cf_script/output_test.rb
+- test/lib/cf_script/scope/app/env_test.rb
+- test/lib/cf_script/scope/app/routes_test.rb
 - test/lib/cf_script/scope/app/state_test.rb
 - test/lib/cf_script/scope/app_test.rb
 - test/lib/cf_script/scope/script_test.rb
 - test/lib/cf_script/scope/space_test.rb
 - test/lib/cf_script/scope/target_test.rb
 - test/lib/cf_script/scope_test.rb
+- test/lib/cf_script/ui_test.rb
 - test/lib/cf_script/utils_test.rb
 - test/lib/cf_script_test.rb
 - test/support/assertions.rb
@@ -252,9 +256,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -265,8 +269,10 @@ test_files:
 - test/lib/cf_script/command/base_test.rb
 - test/lib/cf_script/command/cf/apps/app_test.rb
 - test/lib/cf_script/command/cf/apps/apps_test.rb
+- test/lib/cf_script/command/cf/apps/delete_test.rb
 - test/lib/cf_script/command/cf/apps/env_test.rb
 - test/lib/cf_script/command/cf/apps/push_test.rb
+- test/lib/cf_script/command/cf/apps/rename_test.rb
 - test/lib/cf_script/command/cf/apps/restage_test.rb
 - test/lib/cf_script/command/cf/apps/restart_test.rb
 - test/lib/cf_script/command/cf/apps/set_env_test.rb
@@ -301,12 +307,15 @@ test_files:
 - test/lib/cf_script/output/parser/table_test.rb
 - test/lib/cf_script/output/tests_test.rb
 - test/lib/cf_script/output_test.rb
+- test/lib/cf_script/scope/app/env_test.rb
+- test/lib/cf_script/scope/app/routes_test.rb
 - test/lib/cf_script/scope/app/state_test.rb
 - test/lib/cf_script/scope/app_test.rb
 - test/lib/cf_script/scope/script_test.rb
 - test/lib/cf_script/scope/space_test.rb
 - test/lib/cf_script/scope/target_test.rb
 - test/lib/cf_script/scope_test.rb
+- test/lib/cf_script/ui_test.rb
 - test/lib/cf_script/utils_test.rb
 - test/lib/cf_script_test.rb
 - test/support/assertions.rb

data/lib/cf_script/callbacks.rb

@@ -1,43 +0,0 @@
-module CfScript::Callbacks
-  def callbacks
-    @callbacks ||= { before: {}, after: {} }
-  end
-
-  def before(step, &block)
-    callbacks[:before][step] ||= []
-    callbacks[:before][step] << block
-  end
-
-  def after(step, &block)
-    callbacks[:after][step] ||= []
-    callbacks[:after][step] << block
-  end
-
-  def callbacks_for(type, step)
-    return [] unless callbacks.key?(type) && callbacks[type].key?(step)
-
-    callbacks[type][step]
-  end
-
-  def run_callbacks(type, step)
-    return unless callbacks[type].key?(step)
-
-    callbacks[type][step].each do |callback|
-      instance_eval(&callback)
-    end
-  end
-
-  def run_before(step)
-    run_callbacks(:before, step)
-  end
-
-  def run_after(step)
-    run_callbacks(:after, step)
-  end
-
-  def run_around(step, &block)
-    run_before(step)
-    yield
-    run_after(step)
-  end
-end