methadone 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 692fc45b02fcc752db93e0f638c0ae7f16f9348f
-  data.tar.gz: 64756d9b8d35358f356c399ceff7c113b6dc17d7
+  metadata.gz: 34efc1c3a2d8209ce45d31de375c52a3cb0fa3d8
+  data.tar.gz: 957eeb5f82278810774d35308356768ca4e038c8
 SHA512:
-  metadata.gz: 12cb56fed24b6c59ee1cd0f02c85e846913e7417585cca1e8c65018a030423e8ecf1e34dbc3ea5da8c9176a9876c66a0c3a49287296482008076596ee3444b13
-  data.tar.gz: 8ae9c73f37665294633205fdefc1005735ccf09037a185115a6deea6ff185977991e78173e1d14362358deaccb3b186a01cf4533821be020e696ab31dac6f2c0
+  metadata.gz: e796c7cb5fa1980a1a1ca09ce3bb68f0c2c48acdd4e2ce9f5f3c95d1aea33654ee549b8b204bdae387b9c89aa3188496703a87366d93e4d97e1994f5a254c98a
+  data.tar.gz: 68e86c8dcb4f412282af3fc9056e73a56b5dfe03d791509fd04c94d960cfb90f576d4541c457bae1c2fe02547f991d37b376d604277c441e09cf756ae69b4e86

data/.travis.yml

@@ -7,7 +7,7 @@ rvm:
   - 1.9.3
   - 1.8.7
   - 2.0.0
+  - 2.1.0
   - ree
-  - rbx
   - jruby-18mode
   - jruby-19mode

data/features/bootstrap.feature

@@ -50,20 +50,14 @@ Feature: Bootstrap a new command-line app
       |--log-level|
     And the banner should document that this app takes no arguments
     When I successfully run `rake -T -I../../lib`
-    Then the output should contain:
-    """
-    rake clean         # Remove any temporary products
-    rake clobber       # Remove any generated file
-    rake clobber_rdoc  # Remove RDoc HTML files
-    rake features      # Run Cucumber features
-    """
-    And the output should contain:
-    """
-    rake rdoc          # Build RDoc HTML files
-    rake release       # Create tag v0.0.1 and build and push newgem-0.0.1.gem to Rubygems
-    rake rerdoc        # Rebuild RDoc HTML files
-    rake test          # Run tests
-    """
+    Then the output should match /rake clean/
+    Then the output should match /rake clobber/
+    Then the output should match /rake clobber_rdoc/
+    Then the output should match /rake features/
+    Then the output should match /rake rdoc/
+    Then the output should match /rake release/
+    Then the output should match /rake rerdoc/
+    Then the output should match /rake test/
     And the output should match /rake install       # Build and install newgem-0.0.1.gem into system gems/
     And the output should match /rake build         # Build newgem-0.0.1.gem into the pkg directory/
     When I run `rake -I../../../../lib`
@@ -111,7 +105,6 @@ Feature: Bootstrap a new command-line app
     new-gem version 0.0.1
     """
 
-    @wip
   Scenario: Version flag can be used to only show the app version with a custom format
     Given I successfully run `methadone tmp/new-gem`
     And "bin/new-gem" has configured version to show only the version with a custom format and not help

data/lib/methadone/cli_logger.rb

@@ -85,13 +85,16 @@ module Methadone
       super(log_device)
       @stderr_logger = Logger.new(error_device)
 
-      @split_logs = log_device.tty? && error_device.tty?
+      log_device_tty   = tty?(log_device)
+      error_device_tty = tty?(error_device)
+
+      @split_logs = log_device_tty && error_device_tty
 
       self.level = Logger::Severity::INFO
       @stderr_logger.level = DEFAULT_ERROR_LEVEL
 
-      self.formatter = BLANK_FORMAT if log_device.tty?
-      @stderr_logger.formatter = BLANK_FORMAT if error_device.tty?
+      self.formatter = BLANK_FORMAT if log_device_tty
+      @stderr_logger.formatter = BLANK_FORMAT if error_device_tty
     end
 
     def level=(level)
@@ -119,5 +122,12 @@ module Methadone
       @stderr_logger.formatter=formatter
     end
 
+  private
+
+    def tty?(device_or_string)
+      return device_or_string.tty? if device_or_string.respond_to? :tty?
+      false
+    end
+
   end
 end

data/lib/methadone/version.rb

@@ -1,3 +1,3 @@
 module Methadone #:nodoc:
-  VERSION = "1.3.1" #:nodoc:
+  VERSION = "1.3.2" #:nodoc:
 end

data/test/test_cli_logger.rb

@@ -1,6 +1,7 @@
 require 'base_test'
 require 'methadone'
 require 'stringio'
+require 'tempfile'
 
 class TestCLILogger < BaseTest
   include Methadone
@@ -158,6 +159,27 @@ class TestCLILogger < BaseTest
     }
   end
 
+  test_that "we can use filenames as log devices" do
+    Given {
+      tempfile = Tempfile.new("stderr_log")
+      @stdout_file = tempfile.path
+      tempfile.close
+
+      tempfile = Tempfile.new("stdout_log")
+      @stderr_file = tempfile.path
+      tempfile.close
+    }
+    When {
+      @logger = CLILogger.new(@stdout_file,@stderr_file)
+      @logger.info("some info")
+      @logger.error("some error")
+    }
+    Then {
+      File.read(@stdout_file).should =~ /some info/
+      File.read(@stderr_file).should =~ /some error/
+    }
+  end
+
   private 
 
   def log_all_levels

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: methadone
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - davetron5000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: methadone
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Kick the bash habit and start your command-line apps off right