tapp 1.4.1 → 1.5.0.rc

data/.travis.yml

@@ -1,13 +1,7 @@
 language: ruby
-
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
   - ruby-head
-
-matrix:
-  allow_failures:
-    rvm: ruby-head
-
+  - rbx-18mode
+  - rbx-19mode
 script: bundle exec rspec

data/README.md

@@ -1,4 +1,4 @@
-# tapp [![Build Status](https://secure.travis-ci.org/esminc/tapp.png?branch=master)](http://travis-ci.org/#!/esminc/tapp) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/esminc/tapp)
+# tapp ![Build Status](https://secure.travis-ci.org/esminc/tapp.png?branch=master)
 
 ## Install
 
@@ -21,8 +21,8 @@ See more examples in [spec/acceptance](https://github.com/esminc/tapp/tree/maste
 
 ``` ruby
 Tapp.configure do |config|
-  config.default_printer = :awesome_print
   config.report_caller   = true
+  config.default_printer = :puts
 end
 ```
 
@@ -32,18 +32,21 @@ end
     <th>Default</th>
     <th>Description</th>
   </tr>
-  <tr>
-    <td><code>default_printer</code></td>
-    <td><code>:pretty_print</code></td>
-    <td><a href="https://github.com/esminc/tapp/blob/master/spec/acceptance/default_printer.feature">default_printer.feature</a></td>
-  </tr>
   <tr>
     <td><code>report_caller</code></td>
     <td><code>false</code></td>
     <td><a href="https://github.com/esminc/tapp/blob/master/spec/acceptance/report_caller.feature">report_caller.feature</a></td>
   </tr>
+  <tr>
+    <td><code>default_printer</code></td>
+    <td><code>:pretty_print</code></td>
+    <td><a href="https://github.com/esminc/tapp/blob/master/spec/acceptance/default_printer.feature">default_printer.feature</a></td>
+  </tr>
 </table>
 
+## Custom Printer
+You can define a custom printer. See [custom_printer.feature](https://github.com/esminc/tapp/blob/master/spec/acceptance/custom_printer.feature).
+
 ## Note on Patches/Pull Requests
 
 * Fork the project.

data/lib/tapp.rb

@@ -1,7 +1,9 @@
 require 'tapp/configuration'
 require 'tapp/deprecated'
 require 'tapp/object_extension'
-require 'tapp/printer'
+
+require 'tapp/printer/pretty_print'
+require 'tapp/printer/puts'
 
 module Tapp
   extend Deprecated
@@ -11,8 +13,10 @@ module Tapp
       @config ||= Tapp::Configuration.new
     end
 
-    def configure(&block)
-      config.tap(&block)
+    def configure
+      yield config
+
+      config
     end
   end
 end

data/lib/tapp/object_extension.rb

@@ -11,14 +11,8 @@ module Tapp
       }
     end
 
-    def taputs(&block)
-      tapp :puts, &block
-    end
-
-    def taap
-      warn 'DEPRECATION WARNING: `taap` is deprecated. Set `Tapp.config.default_printer = :awesome_print` and use `tapp` instead.'
-
-      tapp :awesome_print
+    def taputs
+      tapp :puts
     end
   end
 end

data/lib/tapp/printer.rb

@@ -2,20 +2,15 @@ require 'singleton'
 
 module Tapp
   module Printer
-    autoload :AwesomePrint, 'tapp/printer/awesome_print'
-    autoload :PrettyPrint,  'tapp/printer/pretty_print'
-    autoload :Puts,         'tapp/printer/puts'
+    @printers = {}
 
-    def self.instance(name)
-      case name
-      when :pretty_print
-        PrettyPrint.instance
-      when :puts
-        Puts.instance
-      when :awesome_print
-        AwesomePrint.instance
-      else
-        raise ArgumentError, "Unknown printer: #{name.inspect}"
+    class << self
+      def register(name, printer)
+        @printers[name] = printer
+      end
+
+      def instance(name)
+        @printers.fetch(name).instance
       end
     end
 

data/lib/tapp/printer/pretty_print.rb

@@ -1,10 +1,21 @@
 require 'tapp/printer'
-require 'pp'
 
 module Tapp::Printer
   class PrettyPrint < Base
     def print(*args)
-      pp *args
+      require 'pp'
+
+      self.class.class_eval do
+        remove_method :print
+
+        def print(*args)
+          pp *args
+        end
+      end
+
+      print *args
     end
   end
+
+  register :pretty_print, PrettyPrint
 end

data/lib/tapp/printer/puts.rb

@@ -6,4 +6,6 @@ module Tapp::Printer
       puts *args
     end
   end
+
+  register :puts, Puts
 end

data/lib/tapp/turnip.rb

@@ -0,0 +1,34 @@
+module Tapp
+  module Turnip
+    module Steps
+      step 'I have the following code:' do |code|
+        @code = code
+      end
+
+      step 'a file named :filename with:' do |filename, code|
+        @filename, @code = filename, code
+      end
+
+      step 'Ruby it' do
+        stdout = StringIO.new
+        $stdout = stdout
+
+        begin
+          if @filename
+            eval @code, binding, @filename, 1
+          else
+            eval @code
+          end
+        ensure
+          $stdout = STDOUT
+        end
+
+        @output = stdout.string.gsub(/\e\[0.*?m/, '').chop
+      end
+
+      step 'I should see:' do |output|
+        @output.should == output
+      end
+    end
+  end
+end

data/lib/tapp/util.rb

@@ -1,10 +1,12 @@
+require 'tapp'
+
 module Tapp
   module Util
     module_function
 
     def report_called
       inner, outer = caller.partition {|line|
-        line.include?('/lib/tapp')
+        line =~ %r(/lib/tapp/(?!turnip))
       }
 
       method_quoted = inner.last.split(':in').last.strip

data/lib/tapp/version.rb

@@ -1,3 +1,3 @@
 module Tapp
-  VERSION = '1.4.1'
+  VERSION = '1.5.0.rc'
 end

data/spec/acceptance/custom_printer.feature

@@ -0,0 +1,24 @@
+Feature: Custom printer
+  Scenario: define a custom printer and use it
+    Given I have the following code:
+    """
+    require 'tapp/printer'
+
+    module Tapp::Printer
+      class MyPrinter < Base
+        def print(*args)
+          puts "*** #{args.join(' ')} ***"
+        end
+      end
+
+      register :my_printer, MyPrinter
+    end
+
+    %w(foo bar).tapp(:my_printer)
+    """
+
+    When Ruby it
+    Then I should see:
+    """
+    *** foo bar ***
+    """

data/spec/acceptance/default_printer.feature

@@ -1,8 +1,8 @@
 Feature: config.default_printer
-  Scenario: set config.default_printer to :awesome_print and call tapp
+  Scenario: set config.default_printer to :puts and call tapp
     Given I have the following code:
     """
-    Tapp.config.default_printer = :awesome_print
+    Tapp.config.default_printer = :puts
 
     'hoge'.tapp
     """
@@ -10,5 +10,5 @@ Feature: config.default_printer
     When Ruby it
     Then I should see:
     """
-    "hoge"
+    hoge
     """

data/spec/acceptance/taputs.feature

@@ -14,19 +14,3 @@ Feature: Object#taputs
     3
     5
     """
-
-  Scenario: Call taputs with block
-    Given I have the following code:
-    """
-    (1..5).taputs(&:count).select(&:odd?).taputs
-    """
-
-    When Ruby it
-
-    Then I should see:
-    """
-    5
-    1
-    3
-    5
-    """

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
 require 'tapp'
-
-Dir[File.expand_path('../steps/**/*.rb', __FILE__)].each {|f| require f }
+require 'tapp/turnip'
 
 RSpec.configure do |config|
+  config.include Tapp::Turnip::Steps
+
   config.before do
     Tapp.config.reset
   end

data/tapp.gemspec

@@ -19,5 +19,4 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'thor'
 
   s.add_development_dependency 'turnip'
-  s.add_development_dependency 'awesome_print'
 end

metadata

@@ -1,55 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: tapp
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0.rc
+  prerelease: 6
 platform: ruby
 authors:
 - Keita Urashima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2012-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: turnip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: tap { pp self }
@@ -60,9 +51,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -75,46 +66,46 @@ files:
 - lib/tapp/deprecated.rb
 - lib/tapp/object_extension.rb
 - lib/tapp/printer.rb
-- lib/tapp/printer/awesome_print.rb
 - lib/tapp/printer/pretty_print.rb
 - lib/tapp/printer/puts.rb
+- lib/tapp/turnip.rb
 - lib/tapp/util.rb
 - lib/tapp/version.rb
+- spec/acceptance/custom_printer.feature
 - spec/acceptance/default_printer.feature
 - spec/acceptance/report_caller.feature
 - spec/acceptance/tapp.feature
 - spec/acceptance/taputs.feature
 - spec/spec_helper.rb
-- spec/steps/global_steps.rb
 - tapp.gemspec
 homepage: http://github.com/esminc/tapp
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: tap { pp self }
 test_files:
+- spec/acceptance/custom_printer.feature
 - spec/acceptance/default_printer.feature
 - spec/acceptance/report_caller.feature
 - spec/acceptance/tapp.feature
 - spec/acceptance/taputs.feature
 - spec/spec_helper.rb
-- spec/steps/global_steps.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 38e02e650a387df7aa6a8428fa0f4acd62354045
-  data.tar.gz: f12d94f1754403691baca4c058cb9730a0e40926
-SHA512:
-  metadata.gz: 64308928255176b3ca811a4344ed9c4e4492198a4c655c3e97609e1272f7e345e0d449cfab482eafd29148896515938ebc0ebda843de3e30ff522d91d320eb09
-  data.tar.gz: 8ba1f379c3316ac277b0c90fffa39eeba5faa3ac6ffa28232bf8f349bdc1ca27ae1905ace2cccefea4e3a9ff33b91bc5b689c9d040d0d2d2a157e1ab24b2265c

data/lib/tapp/printer/awesome_print.rb

@@ -1,10 +0,0 @@
-require 'tapp/printer'
-require 'ap'
-
-module Tapp::Printer
-  class AwesomePrint < Base
-    def print(*args)
-      ap *args
-    end
-  end
-end

data/spec/steps/global_steps.rb

@@ -1,28 +0,0 @@
-step 'I have the following code:' do |code|
-  @code = code
-end
-
-step 'a file named :filename with:' do |filename, code|
-  @filename, @code = filename, code
-end
-
-step 'Ruby it' do
-  stdout = StringIO.new
-  $stdout = stdout
-
-  begin
-    if @filename
-      eval @code, binding, @filename, 1
-    else
-      eval @code
-    end
-  ensure
-    $stdout = STDOUT
-  end
-
-  @output = stdout.string.gsub(/\e\[0.*?m/, '').chop
-end
-
-step 'I should see:' do |output|
-  @output.should == output
-end