ztk 1.15.3 → 1.16.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzA4MGIwZmUxODA0MWY3ZDI1ZjdkYWVjOThlOTFiZDhlODZlYzY1OQ==
+    NmZiMDg3YWJkN2E2ZDk2NGNmNjIyOGNlNjYwMjFjYTFkOWIyN2NmNw==
   data.tar.gz: !binary |-
-    ZmRjYWNlY2FlOGVhMTJlNjE5Y2NjODI1NjMyNDI1M2I4YzJkNTgyMQ==
+    ZjUzNmNhNTMxZjA0YjMwMjFjZjBmNmRmMDkzNjQ1ZjY4NGMyNzc1Mg==
 SHA512:
   metadata.gz: !binary |-
-    YmMxMzQwZDJiYjRhNjBlNWI5M2NlNmJiMmQ0NjA3MjNhMWFiOGYwZDcwNzEw
-    OGMxMTMxYzZhNzAwMjI3ZTEzMTMzZWJiYzg2ZDc2MzA0ZWFmZWVmYmQxYTA5
-    MWY0Mjk5ODQwZmJiNjMyY2JkMjQwZWRhNzI3ODQ2MmFhYzNmMGI=
+    MWUxODVmZmQ0MWM0ZDI5NmE0MTlmMjIzZjdiMGY4OWNlZmZiMDc5YjkzMjBk
+    ZjRkZDJiMzJlZTY1NWE4ODExMTVjZmJkZjkxMWE2ZWUyOGJiYTE3NDA2NjJi
+    OGNjYmY3N2Y4ZTBiNGE1MjA5ZDFiMzZmNGU5YjZjZmRkMjk2MGM=
   data.tar.gz: !binary |-
-    YzQ2NzJkMjdkOTI1ZWY3OTM2ZjcxMTg4YzJhMTE5Y2U4MDNkYjk2YWJlY2E5
-    MzU2ZTE2ZmQwODhkOWMyNThlNzkzYzAxMThlMzI1NGE3MzViZDY4Mjc4MDU0
-    NzYwYzRkYzM4OGFjOWNhODc3NjBlYzIwZTEyZGU4ZGZkMmI5ZmQ=
+    MjViOGQ0ZWNmODhhZDAyMDhkNTc0YjFhM2FkYzM4MjNmMDkyZGZjNjE0ZDUz
+    OGE1ZjljNjhlMGY0NzBiYzYxNTU4YWI4YmEwMGUyYjY4YzIxMGRjMzdiODY2
+    NjUwNGU0ZTY0NGQyNWU2NDE5NzUyOWQ1YmM1NmIzNjUyYmMzYTE=

data/lib/ztk/benchmark.rb

@@ -76,17 +76,14 @@ module ZTK
 
         !block_given? and Base.log_and_raise(options.ui.logger, BenchmarkError, "You must supply a block!")
 
-        check = [options.message, options.mark]
-        (check.any?{ |z| !z.nil? } && !check.all?{ |z| !z.nil? }) and Base.log_and_raise(options.ui.logger, BenchmarkError, "You must supply both a message and a mark!")
+        if (!options.message.nil? && !options.message.empty?)
+          options.ui.stdout.print(options.message)
+          options.ui.logger.info { options.message }
+        end
 
-        (options.message && options.mark) and options.ui.stdout.print("#{options.message} ")
         benchmark = ::Benchmark.realtime do
-          if (options.message && options.mark)
-            if options.use_spinner
-              ZTK::Spinner.spin(options) do
-                yield
-              end
-            else
+          if options.use_spinner
+            ZTK::Spinner.spin(options) do
               yield
             end
           else
@@ -94,8 +91,10 @@ module ZTK
           end
         end
 
-        (options.message && options.mark) and options.ui.stdout.print("#{options.mark}\n" % benchmark)
-        options.ui.logger.info { "#{options.message} #{options.mark}" % benchmark }
+        if (!options.mark.nil? && !options.mark.empty?)
+          options.ui.stdout.print(options.mark % benchmark)
+          options.ui.logger.info { options.mark % benchmark }
+        end
 
         benchmark
       end

data/lib/ztk/logger.rb

@@ -150,7 +150,7 @@ module ZTK
 
       called_by = parse_caller(caller[1+shift])
 
-      message = [message, progname].flatten.compact.join(": ")
+      message = [message.chomp, progname].flatten.compact.join(": ")
       message = "%19s.%06d|%05d|%5s|%s%s\n" % [Time.now.utc.strftime("%Y-%m-%d|%H:%M:%S"), Time.now.utc.usec, Process.pid, SEVERITIES[severity], called_by, message]
 
       @logdev.write(ZTK::ANSI.uncolor(message))

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.15.3"
+  VERSION = "1.16.1"
 
 end

data/spec/ztk/benchmark_spec.rb

@@ -55,20 +55,22 @@ describe ZTK::Benchmark do
       mark.should be_an_instance_of Float
     end
 
-    it "should throw an exception if executed with a message but without a mark" do
-      lambda {
-        ZTK::Benchmark.bench(:ui => @ui, :message => "Hello World")
-      }.should raise_error ZTK::BenchmarkError
+    it "should not throw an exception if executed with a message but without a mark" do
+      expect {
+        ZTK::Benchmark.bench(:ui => @ui, :message => "Hello World") do
+        end
+      }.not_to raise_error
     end
 
-    it "should throw an exception if executed without a message but with a mark" do
-      lambda {
-        ZTK::Benchmark.bench(:ui => @ui, :mark => "%0.4f")
-      }.should raise_error ZTK::BenchmarkError
+    it "should not throw an exception if executed without a message but with a mark" do
+      expect {
+        ZTK::Benchmark.bench(:ui => @ui, :mark => "%0.4f") do
+        end
+      }.not_to raise_error
     end
 
     it "should not write to STDOUT if not given a message or mark" do
-      ZTK::Benchmark.bench(:ui => @ui) do
+      ZTK::Benchmark.bench(:ui => @ui, :use_spinner => false) do
         sleep(0.1)
       end
       @ui.stdout.size.should == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.15.3
+  version: 1.16.1
 platform: ruby
 authors:
 - Zachary Patten
@@ -345,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Zachary's Tool Kit