inform 0.0.2 → 0.0.3

data/examples/frozbot

@@ -10,9 +10,17 @@ class Frozbot
   end
 end
 
-Inform.level = :info
-frozbot = Inform.info("Initializing the frozbot...") do
+Inform.level = :debug
+
+Inform.info("About to start")
+
+frozbot = Inform.info("Initializing the %{thing}...", :thing => 'frozbot') do
+  Inform.debug "Preparing to make a new frozbot called %{name}", :name => 'puddy'
   Frozbot.new 'puddy'
 end
 
-Inform.info("Frozbot is %{name}", :name => frozbot.name)
+Inform.info("Frozbot called %{name} has been initialized.  Go %{name}, go!", :name => frozbot.name)
+
+Inform.warning 'Hey wait on'
+Inform.error 'There is an error in the %{thing} thing.', :thing => 'frozbot'
+

data/inform.gemspec

@@ -12,7 +12,9 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.add_development_dependency("rspec", "~> 2.6.0")
-  
+  s.add_development_dependency("rake")
+  s.add_development_dependency("gem-release")
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/inform/version.rb

@@ -1,3 +1,3 @@
 class Inform
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/inform.rb

@@ -18,7 +18,7 @@ class Inform
 
   DEFAULT_LOG_LEVEL = :info
   LOG_LEVELS = [:debug, :info, :warning, :error]
-  
+
   class << self
 
     def level
@@ -71,7 +71,8 @@ class Inform
           @need_newline = false
         end
         message += "\n" if end_with_newline
-        print message
+        $stdout.print message
+        $stdout.flush
       end
     end
 
@@ -86,7 +87,7 @@ class Inform
       end
       message + CLEAR
     end
-    
+
     def color(message, *colours)
       colours.join("") + message + CLEAR
     end

data/spec/inform_spec.rb

@@ -3,26 +3,50 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 def should_print method
   describe method do
     it "should print a message" do
-      Inform.should_receive(:print).with(/a special message/)
+      $stdout.should_receive(:print).with(/a special message/)
       Inform.send(method, "a special message")
     end
+    it "should interpolate keyword arguments" do
+      $stdout.should_receive(:print).with(/hello.+hey.+you.+goodbye/)
+      Inform.send(method, "hello %{a} %{b} goodbye", :a => 'hey', :b => 'you')
+    end
   end
 end
 
 def should_not_print method
   describe method do
     it "should not print a message" do
-      Inform.should_not_receive(:say)
-      Inform.should_not_receive(:print)
+      $stdout.should_not_receive(:print)
       Inform.send(method, "a special message")
     end
   end
 end
-  
-# TODO: refactor, deal with all combinations of message / log level
+
+def should_accept_block method
+  describe ":#{method.to_s} with a block" do
+    it "should print out the task being executed" do
+      $stdout.should_receive(:print).with(/message/)
+      Inform.send(method, "message") { true }
+    end
+    it "should print Done once the task is complete" do
+      $stdout.should_receive(:print).with(/Done/)
+      Inform.send(method, "") { true }
+    end
+    it "should evaluate the passed block and return the result" do
+      Inform.send(method, "") { 'hello' }.should == 'hello'
+    end
+    it "should allow us to print messages from within a block" do
+      $stdout.should_receive(:print).with(/open/)
+      $stdout.should_receive(:print).with(/inner/)
+      Inform.send(method, "open") { Inform.send(method, "inner") }
+    end
+  end
+end
+
 describe Inform do
   before :each do
     @oldlevel = Inform.level
+    $stdout.stub(:print => nil) # SSSSSH.
   end
   after :each do
     Inform.level = @oldlevel
@@ -40,36 +64,12 @@ describe Inform do
   end
   
   context "with log level debug" do
-    before :each do
-      Inform.level = :debug
-      Inform.stub(:print => nil) # SSSSSH.
-    end
+    before { Inform.level = :debug }
 
     should_print :debug    
     should_print :info    
-
-    describe ":info with a block" do
-      it "should print out the task being executed" do
-        Inform.should_receive(:print).with(/message/)
-        Inform.info("message") { true }
-      end
-      it "should print Done once the task is complete" do
-        Inform.should_receive(:print).with(/Done/)
-        Inform.info("") { true }
-      end
-      it "should evaluate the passed block and return the result" do
-        Inform.info("") { 'hello' }.should == 'hello'
-      end
-      it "should interpolate keyword arguments" do
-        Inform.should_receive(:print).with(/hello.+hey.+you.+goodbye/)
-        Inform.info("hello %{a} %{b} goodbye", :a => 'hey', :b => 'you')
-      end
-      it "should allow us to print messages from within a block" do
-        Inform.should_receive(:print).with(/open/)
-        Inform.should_receive(:print).with(/inner/)
-        Inform.info("open") { Inform.debug("inner") }
-      end
-    end
+    should_accept_block :info
+    # should_accept_block :debug
 
     should_print :warning
     should_print :error
@@ -79,6 +79,9 @@ describe Inform do
     before { Inform.level = :info }
     should_not_print :debug
     should_print :info
+    should_accept_block :info
+    # should_accept_block :debug
+    
     should_print :warning
     should_print :error
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inform
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael Pearson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 Z
+date: 2011-06-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -34,6 +34,34 @@ dependencies:
         version: 2.6.0
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: gem-release
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Interactive, colourised logging
 email: 
 - mipearson@gmail.com