bowler 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f3029134b99712158fefc7f67192400f1ce3a66
-  data.tar.gz: 0cb0f7b2a4b43674be3eeb773f662f4a4db0bf2b
+  metadata.gz: 34dce92fc34665431104d25780c2ee924d7798bf
+  data.tar.gz: 30fb9e9a5d122d746f1aec3dec9d5f96f5dce6c6
 SHA512:
-  metadata.gz: ae91243c358bbd57f95730e4f2dad029ad8ed51927b0221f31a3c40ed391eb26140d78665083452a51009018710acaf7e8a85fcf22493cd65f9b321ad9f2db2a
-  data.tar.gz: 603644789457344e7b59a96ad9ead3aa20c9458a6e777148f2441258710a24a8f875616147dad4895a1723ed795289ff6b61443d49a4ee70660136afb95b4b92
+  metadata.gz: f50128ef53e016098215488f39bec12caa1fadf6c6d8ef9dbb9038de687ffdca1b5f604ca2214294fa1ec85341ca9d154f0d1a159550a8da96af24a00e386bea
+  data.tar.gz: d2d92d904c36456adaf7889acf16d17abe72aeb2a84f68861c0d2c000cedbe8fc849daf8b04356ae3eb0aab9b410dd4a13f83d41804b24556921990c21a47cbd

data/lib/bowler.rb

@@ -1,11 +1,13 @@
 require 'ostruct'
+require 'bowler/version'
 
 module Bowler
 
+  autoload :CLI,                  'bowler/cli'
   autoload :DependencyTree,       'bowler/dependency_tree'
   autoload :DSL,                  'bowler/dsl'
 
   class PinfileNotFound < Exception; end
   class PinfileError < Exception; end
 
-end
+end

data/lib/bowler/cli.rb

@@ -1,17 +1,38 @@
 require 'logger'
+require 'optparse'
 
 module Bowler
   class CLI
 
-    def self.start(processes)
-      tree = Bowler::DependencyTree.load
-      process_list = processes.map(&:to_sym)
+    def self.start(args)
+      options = {
+        without: []
+      }
+      OptionParser.new {|opts|
+        opts.banner = "Usage: bowl [options] <process>..."
+
+        opts.on('-w', '--without <process>', 'Exclude a process from being launched') do |process|
+          options[:without] << process.to_sym
+        end
+
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
 
-      launch_string = tree.process_list_for(process_list)
+        opts.on_tail('-v', '--version', 'Show the gem version') do
+          puts "Bowler #{Bowler::VERSION}"
+          exit
+        end
+      }.parse!(args)
 
-      logger.info "Starting #{tree.dependencies_for(process_list).join(', ')}.."
+      processes = args.map(&:to_sym)
+
+      tree = Bowler::DependencyTree.load
+      to_launch = tree.dependencies_for(processes) - options[:without]
+      logger.info "Starting #{to_launch.join(', ')}.."
 
-      start_foreman_with launch_string
+      start_foreman_with( launch_string(to_launch) )
     rescue PinfileNotFound
       logger.error "Bowler could not find a Pinfile in the current directory."
     rescue PinfileError => e
@@ -19,14 +40,24 @@ module Bowler
     end
 
     def self.logger
-      @logger ||= Logger.new(STDOUT)
+      @@logger ||= Logger.new(STDOUT)
+    end
+
+    def self.logger=(logger)
+      @@logger = logger
     end
 
     def self.build_command(launch_string)
       "#{self.foreman_exec} start -c #{launch_string}"
     end
 
-    private
+  private
+    def self.launch_string(processes)
+      processes.map {|process|
+        "#{process}=1"
+      }.sort.join(',')
+    end
+
     def self.start_foreman_with(launch_string)
       exec ( self.build_command launch_string )
     end

data/lib/bowler/dependency_tree.rb

@@ -20,9 +20,5 @@ module Bowler
       }.flatten.compact.uniq
     end
 
-    def process_list_for(processes)
-      dependencies_for(processes).map {|x| "#{x}=1" }.sort.join(',')
-    end
-
   end
 end

data/lib/bowler/version.rb

@@ -1,3 +1,3 @@
 module Bowler
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/cli_spec.rb

@@ -5,6 +5,8 @@ module Bowler
 
   describe CLI do
 
+    include CLIHelper
+
     context "build_command" do
       it "should build a command from the launch string and the executable" do
         CLI.expects(:foreman_exec).returns("fort")
@@ -33,6 +35,39 @@ module Bowler
       end
     end
 
+    context 'excluding an app' do
+      it 'removes a given app from the list of apps passed to Foreman' do
+        stub_dependency_tree(:myapp, :myapp2)
+
+        CLI.expects(:start_foreman_with).with('myapp2=1')
+
+        CLI.start(['myapp', 'myapp2', '--without', 'myapp'])
+      end
+
+      it 'excludes more than one app from the list of apps passed to Foreman' do
+        stub_dependency_tree(:myapp, :myapp2, :myapp3)
+
+        CLI.expects(:start_foreman_with).with('myapp3=1')
+
+        CLI.start(['myapp', 'myapp2', 'myapp3', '--without', 'myapp', '--without', 'myapp2'])
+      end
+
+      it 'supports the short-hand argument form Foreman' do
+        stub_dependency_tree(:myapp, :myapp2)
+
+        CLI.expects(:start_foreman_with).with('myapp2=1')
+
+        CLI.start(['myapp', 'myapp2', '-w', 'myapp'])
+      end
+    end
+
+    it 'starts foreman with the provided processes' do
+      stub_dependency_tree(:a, :b)
+
+      CLI.expects(:start_foreman_with).with('a=1,b=1')
+
+      CLI.start(['a', 'b'])
+    end
   end
 
 end

data/spec/dependency_tree_spec.rb

@@ -37,10 +37,6 @@ module Bowler
       it "should find the correct dependencies" do
         @tree.dependencies_for([:app1]).should =~ [:app2, :app3, :app1]
       end
-
-      it "should give a correct process list" do
-        @tree.process_list_for([:app2]).should == "app2=1,app3=1"
-      end
     end
 
     context "given an array of multiple processes" do
@@ -51,10 +47,6 @@ module Bowler
       it "should find the correct dependencies" do
         @tree.dependencies_for([:app1, :other]).should =~ [:app2, :app3, :app1, :a, :b, :c, :other]
       end
-
-      it "should give a correct process list" do
-        @tree.process_list_for([:app2, :other]).should == "a=1,app2=1,app3=1,b=1,c=1,other=1"
-      end
     end
 
   end

data/spec/helpers/cli_helper.rb

@@ -0,0 +1,14 @@
+module Bowler
+  module CLIHelper
+
+    # stubs the behaviour of a tree with no dependencies, but stubs out all
+    # the dependency-lookup behaviour and Pinfile parsing
+    def stub_dependency_tree(*processes)
+      mock_tree = mock('Bowler::DependencyTree')
+      Bowler::DependencyTree.expects(:load).returns(mock_tree)
+
+      mock_tree.expects(:dependencies_for).with(processes).returns(processes)
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,9 @@ require 'rspec/core'
 require 'bowler'
 
 require_relative 'helpers/definition_helper'
+require_relative 'helpers/cli_helper'
+
+Bowler::CLI.logger = Logger.new('/dev/null')
 
 RSpec.configure do |config|
   config.mock_framework = :mocha

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bowler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jordan Hatch
@@ -102,6 +102,7 @@ files:
 - spec/fixtures/dependency_tree_pinfile
 - spec/fixtures/dsl_invalid_pinfile
 - spec/fixtures/dsl_valid_pinfile
+- spec/helpers/cli_helper.rb
 - spec/helpers/definition_helper.rb
 - spec/spec_helper.rb
 homepage: 
@@ -134,5 +135,6 @@ test_files:
 - spec/fixtures/dependency_tree_pinfile
 - spec/fixtures/dsl_invalid_pinfile
 - spec/fixtures/dsl_valid_pinfile
+- spec/helpers/cli_helper.rb
 - spec/helpers/definition_helper.rb
 - spec/spec_helper.rb