ztk 3.0.4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdc8f617cd4946e08ae511019c8c824602e10690
-  data.tar.gz: d59c97edbd63a148a7453aa5ccfc5ade274928b0
+  metadata.gz: 1209eb8e5e2897a3911c0e7048080bc532b86c43
+  data.tar.gz: 0b41dee03dac4f105de394722dfa9608e98fc221
 SHA512:
-  metadata.gz: d2ba6a6764ad01b16e5e7dfd33e704f34b7c33c666299745622035c8eeefc0fc0c71d9bacb18f4587e24de74c5688a6a6a20d8b3fe4dc5e966a54dc8d4be3292
-  data.tar.gz: 6f715ee4bb05e8cc3430756556834f6057d0cd9e4d7525a054836c2240d0b2f3f8c355dbb9b6fd41df81d61b3b7ed9515eca9708237ed49017dd0de782327a1c
+  metadata.gz: d79fceb184898082b9db8edb3c040aee94edb10f07b25588daf7700c5813699652f3c7dc0973ef23f29a0e6e601e8d93590cc3c01e86e086603074f27d300789
+  data.tar.gz: 7759484bac6dff0b686c7ae43e54a6e60ca10bfbaa288b5f9522fd0acab96816d0212c89bc4e0de1f6ae5445576822ae83a2b7541362ec317d36f20151dcca17

data/lib/ztk/profiler/core.rb

@@ -11,6 +11,7 @@ module ZTK
 
       def start
         reset
+        @@start_time  = Time.now.utc
 
         true
       end
@@ -22,7 +23,7 @@ module ZTK
       end
 
       def reset
-        @@start_time  = Time.now.utc
+        @@start_time  = nil
         @@end_time    = nil
         @@timer_stack = Array.new
         Timer.reset
@@ -54,8 +55,12 @@ module ZTK
       end
 
       def total_time
-        stop
-        @@end_time - @@start_time
+        if @@start_time.nil?
+          raise ProfilerError, "You must start the profiler in order to calculate a total time!"
+        else
+          stop
+          @@end_time - @@start_time
+        end
       end
 
       def report(options={})

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "3.0.4"
+  VERSION = "3.1.0"
 
 end

data/spec/ztk/ansi_spec.rb

@@ -27,7 +27,7 @@ describe "ZTK::ANSI Module" do
   describe "module" do
 
     it "should be ZTK::ANSI" do
-      subject.should be ZTK::ANSI
+      expect(subject).to be ZTK::ANSI
     end
 
   end
@@ -36,11 +36,11 @@ end
 
 describe "ZTK::ANSI Monkey-Patch String Class" do
 
-  subject {
+  subject do
     class String
       include ZTK::ANSI
     end
-  }
+  end
 
   describe "class" do
 

data/spec/ztk/background_spec.rb

@@ -27,7 +27,7 @@ describe ZTK::Background do
   describe "class" do
 
     it "should be an instance of ZTK::Background" do
-      subject.should be_an_instance_of ZTK::Background
+      expect(subject).to be_an_instance_of ZTK::Background
     end
 
   end
@@ -35,7 +35,7 @@ describe ZTK::Background do
   describe "behaviour" do
 
     it "should throw an exception if the process method is called without a block" do
-      lambda{ subject.process }.should raise_error ZTK::BackgroundError, "You must supply a block to the process method!"
+      expect{ subject.process }.to raise_error ZTK::BackgroundError, "You must supply a block to the process method!"
     end
 
     describe "process" do
@@ -46,9 +46,9 @@ describe ZTK::Background do
         end
 
         subject.wait
-        subject.result.should be_kind_of Integer
-        subject.result.should > 0
-        subject.result.should_not == Process.pid
+        expect(subject.result).to be_kind_of Integer
+        expect(subject.result).to be > 0
+        expect(subject.result).not_to be == Process.pid
       end
 
     end
@@ -59,11 +59,11 @@ describe ZTK::Background do
         subject.process do
           sleep(WAIT_SMALL)
         end
-        subject.alive?.should be true
+        expect(subject.alive?).to be == true
 
         subject.wait
-        subject.result.should be_kind_of Integer
-        subject.result.should > 0
+        expect(subject.result).to be_kind_of Integer
+        expect(subject.result).to be > 0
       end
 
       it "should respond false when the process is no longer running" do
@@ -73,11 +73,11 @@ describe ZTK::Background do
         subject.wait
         sleep(WAIT_SMALL)
 
-        subject.alive?.should be false
+        expect(subject.alive?).to be == false
 
-        subject.result.should be_kind_of Integer
-        subject.result.should > 0
-        subject.result.should_not == Process.pid
+        expect(subject.result).to be_kind_of Integer
+        expect(subject.result).to be > 0
+        expect(subject.result).not_to be == Process.pid
       end
 
     end
@@ -89,12 +89,12 @@ describe ZTK::Background do
           sleep(WAIT_SMALL)
           WAIT_SMALL
         end
-        subject.dead?.should be false
+        expect(subject.dead?).to be false
 
         subject.wait
-        subject.result.should be_kind_of Integer
-        subject.result.should > 0
-        subject.result.should == WAIT_SMALL
+        expect(subject.result).to be_kind_of Integer
+        expect(subject.result).to be > 0
+        expect(subject.result).to be == WAIT_SMALL
       end
 
       it "should respond true when the process is no longer running" do
@@ -104,11 +104,11 @@ describe ZTK::Background do
         subject.wait
         sleep(WAIT_SMALL)
 
-        subject.dead?.should be true
+        expect(subject.dead?).to be true
 
-        subject.result.should be_kind_of Integer
-        subject.result.should > 0
-        subject.result.should_not == Process.pid
+        expect(subject.result).to be_kind_of Integer
+        expect(subject.result).to be > 0
+        expect(subject.result).not_to be == Process.pid
       end
 
     end
@@ -127,8 +127,8 @@ describe ZTK::Background do
         end
         subject.wait
 
-        subject.result.should be_kind_of BackgroundMarshalTest
-        subject.result.hello_world.should == "Hello World"
+        expect(subject.result).to be_kind_of BackgroundMarshalTest
+        expect(subject.result.hello_world).to be == "Hello World"
       end
 
     end

data/spec/ztk/base_spec.rb

@@ -27,7 +27,7 @@ describe ZTK::Base do
   describe "class" do
 
     it "should be ZTK::Base" do
-      subject.should be ZTK::Base
+      expect(subject).to be ZTK::Base
     end
 
   end

data/spec/ztk/benchmark_spec.rb

@@ -22,20 +22,14 @@ require "spec_helper"
 
 describe ZTK::Benchmark do
 
-  before(:each) do
-    @ui = ZTK::UI.new(
-      :stdout => StringIO.new,
-      :stderr => StringIO.new,
-      :stdin => StringIO.new
-    )
-  end
+  let(:ui) { ZTK::UI.new(:stdout => StringIO.new, :stderr => StringIO.new, :stdin => StringIO.new) }
 
   subject { ZTK::Benchmark }
 
   describe "class" do
 
     it "should be ZTK::Benchmark" do
-      subject.should be ZTK::Benchmark
+      expect(subject).to be ZTK::Benchmark
     end
 
   end
@@ -43,44 +37,43 @@ describe ZTK::Benchmark do
   describe "behaviour" do
 
     it "should throw an exception if executed without a block" do
-      lambda {
-        ZTK::Benchmark.bench
-      }.should raise_error ZTK::BenchmarkError, "You must supply a block!"
+      expect{ ZTK::Benchmark.bench }.to raise_error ZTK::BenchmarkError
     end
 
     it "should return the benchmark of the given block" do
       mark = ZTK::Benchmark.bench do
         sleep(0.1)
       end
-      mark.should be_an_instance_of Float
+      expect(mark).to be_an_instance_of Float
     end
 
     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
+      expect{
+        ZTK::Benchmark.bench(:ui => ui, :message => "Hello World") do
+          sleep(0.1)
         end
       }.not_to raise_error
     end
 
     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
+      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, :use_spinner => false) do
+      ZTK::Benchmark.bench(:ui => ui, :use_spinner => false) do
         sleep(0.1)
       end
-      @ui.stdout.size.should == 0
+      expect(ui.stdout.size).to be == 0
     end
 
     it "should write to STDOUT if given a message and mark" do
-      ZTK::Benchmark.bench(:ui => @ui, :message => "Hello World", :mark => "%0.4f") do
+      ZTK::Benchmark.bench(:ui => ui, :message => "Hello World", :mark => "%0.4f") do
         sleep(0.1)
       end
-      @ui.stdout.size.should > 0
+      expect(ui.stdout.size).to be > 0
     end
 
   end

data/spec/ztk/command_spec.rb

@@ -22,20 +22,14 @@ require "spec_helper"
 
 describe ZTK::Command do
 
-  before(:each) do
-    @ui = ZTK::UI.new(
-      :stdout => StringIO.new,
-      :stderr => StringIO.new,
-      :stdin => StringIO.new
-    )
-  end
+  let(:ui) { ZTK::UI.new(:stdout => StringIO.new, :stderr => StringIO.new, :stdin => StringIO.new) }
 
-  subject { ZTK::Command.new(:ui => @ui) }
+  subject { ZTK::Command.new }
 
   describe "class" do
 
     it "should be an instance of ZTK::Command" do
-      subject.should be_an_instance_of ZTK::Command
+      expect(subject).to be_an_instance_of ZTK::Command
     end
 
   end
@@ -45,86 +39,80 @@ describe ZTK::Command do
     describe "execute" do
 
       it "should be able to execute the command \"hostname\"" do
-        subject.config do |config|
-          config.ui = @ui
-        end
+        subject.config.ui = ui
+
         hostname = %x(hostname).chomp
         status = subject.exec("hostname")
-        status.exit_code.should == 0
-        @ui.stdout.rewind
-        @ui.stdout.read.chomp.should == hostname
+        expect(status.exit_code).to be == 0
+        ui.stdout.rewind
+        expect(ui.stdout.read.chomp).to match(hostname)
       end
 
       it "should timeout after the period specified" do
         subject.config do |config|
-          config.ui = @ui
+          config.ui = ui
           config.timeout = WAIT_SMALL
         end
         hostname = %x(hostname).chomp
-        lambda { subject.exec("hostname ; sleep 10") }.should raise_error ZTK::CommandError
+        expect{ subject.exec("hostname ; sleep 10") }.to raise_error ZTK::CommandError
       end
 
       it "should throw an exception if the exit status is not as expected" do
-        subject.config do |config|
-          config.ui = @ui
-        end
-        lambda { subject.exec("/bin/bash -c 'exit 64'") }.should raise_error ZTK::CommandError
+        subject.config.ui = ui
+
+        expect{ subject.exec("/bin/bash -c 'exit 64'") }.to raise_error ZTK::CommandError
       end
 
       it "should return a instance of an OpenStruct object" do
-        subject.config do |config|
-          config.ui = @ui
-        end
+        subject.config.ui = ui
+
         result = subject.exec(%q{echo "Hello World"})
-        result.should be_an_instance_of OpenStruct
+        expect(result).to be_an_instance_of OpenStruct
       end
 
       it "should return the exit code" do
-        subject.config do |config|
-          config.ui = @ui
-        end
+        subject.config.ui = ui
+
         data = 64
 
-        result = subject.exec(%Q{/bin/bash -c 'exit #{data}'}, :exit_code => data)
-        result.exit_code.should == data
+        result = subject.exec(%{exit #{data}}, :exit_code => data)
+        expect(result.exit_code).to be == data
       end
 
       it "should return the output" do
-        subject.config do |config|
-          config.ui = @ui
-        end
+        subject.config.ui = ui
+
         data = "Hello World @ #{Time.now.utc}"
 
-        result = subject.exec(%Q{echo "#{data}"})
-        result.output.match(data).should_not be nil
+        result = subject.exec(%{echo "#{data}"})
+        expect(result.output).to match(data)
       end
 
       it "should allow us to change the expected exit code" do
-        subject.config do |config|
-          config.ui = @ui
-        end
+        subject.config.ui = ui
+
         data = 32
-        result = subject.exec(%Q{/bin/bash -c 'exit #{data}'}, :exit_code => data)
+        result = subject.exec(%{exit #{data}}, :exit_code => data)
+        expect(result.exit_code).to be == data
       end
 
       describe "stdout" do
 
         it "should capture STDOUT and send it to the appropriate pipe" do
-          subject.config do |config|
-            config.ui = @ui
-          end
+          subject.config.ui = ui
+
           data = "Hello World @ #{Time.now.utc}"
 
-          subject.exec(%Q{echo "#{data}" >&1})
+          subject.exec(%{echo "#{data}" >&1})
 
-          @ui.stdout.rewind
-          @ui.stdout.read.match(data).should_not be nil
+          ui.stdout.rewind
+          expect(ui.stdout.read).to match(data)
 
-          @ui.stderr.rewind
-          @ui.stderr.read.match(data).should be nil
+          ui.stderr.rewind
+          expect(ui.stderr.read).to be_empty
 
-          @ui.stdin.rewind
-          @ui.stdin.read.match(data).should be nil
+          ui.stdin.rewind
+          expect(ui.stdin.read).to be_empty
         end
 
       end
@@ -132,21 +120,20 @@ describe ZTK::Command do
       describe "stderr" do
 
         it "should capture STDERR and send it to the appropriate pipe" do
-          subject.config do |config|
-            config.ui = @ui
-          end
+          subject.config.ui = ui
+
           data = "Hello World @ #{Time.now.utc}"
 
-          subject.exec(%Q{echo "#{data}" >&2})
+          subject.exec(%{echo "#{data}" >&2})
 
-          @ui.stdout.rewind
-          @ui.stdout.read.match(data).should be nil
+          ui.stdout.rewind
+          expect(ui.stdout.read).to be_empty
 
-          @ui.stderr.rewind
-          @ui.stderr.read.match(data).should_not be nil
+          ui.stderr.rewind
+          expect(ui.stderr.read).to match(data)
 
-          @ui.stdin.rewind
-          @ui.stdin.read.match(data).should be nil
+          ui.stdin.rewind
+          expect(ui.stdin.read).to be_empty
         end
       end
 
@@ -155,7 +142,7 @@ describe ZTK::Command do
     describe "upload" do
 
       it "should raise a 'Not Supported' exception when attempting to upload" do
-        lambda { subject.upload("abc", "123") }.should raise_error
+        expect{ subject.upload("abc", "123") }.to raise_error ZTK::CommandError
       end
 
     end
@@ -163,7 +150,7 @@ describe ZTK::Command do
     describe "download" do
 
       it "should raise a 'Not Supported' exception when attempting to download" do
-        lambda { subject.download("abc", "123") }.should raise_error
+        expect{ subject.download("abc", "123") }.to raise_error ZTK::CommandError
       end
 
     end