ztk 1.4.5 → 1.4.6

data/.travis.yml

@@ -1,16 +1,16 @@
 language: ruby
 
 rvm:
+  - ree
   - 1.9.2
   - 1.9.3
   - 2.0.0
 
-before_install:
-  - sudo apt-get -qq --force-yes update
-
-bundler_args: --binstubs
-
-script: "rake test"
+before_install: ./spec/support/before_install.sh
 
 notifications:
   irc: "irc.freenode.net#jovelabs"
+
+matrix:
+  allow_failures:
+    - rvm: ree

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+gem "json" if (RUBY_VERSION == "1.8.7")
+
 gemspec

data/lib/ztk/template.rb

@@ -52,8 +52,10 @@ module ZTK
 
         notice << char
         notice << "#{char} WARNING: AUTOMATICALLY GENERATED FILE; DO NOT EDIT!"
-        notice << char
-        notice << "#{char} #{message}" if !message.nil?
+        if !message.nil?
+          notice << char
+          notice << "#{char} #{message}"
+        end
         notice << char
         notice << "#{char} Generated @ #{Time.now.utc}"
         notice << char

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.4.5"
+  VERSION = "1.4.6"
 
 end

data/spec/support/before_install.sh

@@ -0,0 +1,41 @@
+################################################################################
+#
+#      Author: Zachary Patten <zachary AT jovelabs DOT com>
+#   Copyright: Copyright (c) Zachary Patten
+#     License: Apache License, Version 2.0
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+################################################################################
+#!/bin/bash
+set -x
+
+sudo apt-get -qq update
+
+ssh -V
+cat /etc/ssh/sshd_config
+ls -la $HOME
+
+eval `ssh-agent -s`
+ssh-add -L
+
+mkdir -p $HOME/.ssh
+ssh-keygen -N '' -f $HOME/.ssh/id_rsa
+
+ls -la $HOME/.ssh
+
+cat $HOME/.ssh/id_rsa.pub | tee $HOME/.ssh/authorized_keys
+cat $HOME/.ssh/id_rsa.pub | tee $HOME/.ssh/authorized_keys2
+
+ssh-add $HOME/.ssh/id_rsa
+ssh-add -L

data/spec/ztk/parallel_spec.rb

@@ -32,42 +32,81 @@ describe ZTK::Parallel do
 
   end
 
-  describe "behaviour" do
+  describe "methods" do
 
-    it "should throw an exception if the process method is called without a block" do
-      lambda{ subject.process }.should raise_error ZTK::ParallelError, "You must supply a block to the process method!"
-    end
 
-    it "should spawn multiple processes to handle each iteration" do
-      3.times do |x|
-        subject.process do
-          Process.pid
+    describe "#process" do
+
+      it "should throw an exception if the process method is called without a block" do
+        lambda{ subject.process }.should raise_error ZTK::ParallelError, "You must supply a block to the process method!"
+      end
+
+      it "should spawn multiple processes to handle each iteration" do
+        3.times do |x|
+          subject.process do
+            Process.pid
+          end
         end
+
+        subject.waitall
+
+        subject.results.all?{ |r| r.should be_kind_of Integer }
+        subject.results.all?{ |r| r.should > 0 }
+        subject.results.uniq.count.should == 3
+        subject.results.include?(Process.pid).should be false
       end
 
-      subject.waitall
+    end
+
+    describe "#wait" do
+
+      it "should be able to incrementally wait the forks" do
+        3.times do |x|
+          subject.process do
+            Process.pid
+          end
+        end
+
+        3.times do
+          subject.wait
+        end
+
+        subject.results.all?{ |r| r.should be_kind_of Integer }
+        subject.results.all?{ |r| r.should > 0 }
+        subject.results.uniq.count.should == 3
+        subject.results.include?(Process.pid).should be false
+      end
 
-      subject.results.all?{ |r| r.should be_kind_of Integer }
-      subject.results.all?{ |r| r.should > 0 }
-      subject.results.uniq.count.should == 3
-      subject.results.include?(Process.pid).should be false
     end
 
-    it "should be able to incrementally wait the forks" do
-      3.times do |x|
-        subject.process do
-          Process.pid
+    describe "#waitall" do
+
+      it "should be able to wait for all forks to stop" do
+        3.times do |x|
+          subject.process do
+            Process.pid
+          end
         end
+
+        subject.waitall
+        subject.count.should == 0
       end
 
-      3.times do
-        subject.wait
+    end
+
+    describe "#count" do
+
+      it "should return the number of active forked processes" do
+        3.times do |x|
+          subject.process do
+            sleep(WAIT_SMALL)
+          end
+        end
+
+        subject.count.should == 3
+        subject.waitall
       end
 
-      subject.results.all?{ |r| r.should be_kind_of Integer }
-      subject.results.all?{ |r| r.should > 0 }
-      subject.results.uniq.count.should == 3
-      subject.results.include?(Process.pid).should be false
     end
 
   end

data/spec/ztk/ssh_spec.rb

@@ -245,7 +245,13 @@ describe ZTK::SSH do
         File.exists?(remote_file) && File.delete(remote_file)
 
         local_file = File.join("/tmp", "ssh-upload-local")
-        IO.write(local_file, data)
+        if RUBY_VERSION < "1.9.3"
+          File.open(local_file, 'w') do |file|
+            file.puts(data)
+          end
+        else
+          IO.write(local_file, data)
+        end
 
         File.exists?(remote_file).should == false
         subject.upload(local_file, remote_file)
@@ -273,7 +279,13 @@ describe ZTK::SSH do
         File.exists?(local_file) && File.delete(local_file)
 
         remote_file = File.join("/tmp", "ssh-download-remote")
-        IO.write(remote_file, data)
+        if RUBY_VERSION < "1.9.3"
+          File.open(remote_file, 'w') do |file|
+            file.puts(data)
+          end
+        else
+          IO.write(remote_file, data)
+        end
 
         File.exists?(local_file).should == false
         subject.download(remote_file, local_file)
@@ -285,7 +297,7 @@ describe ZTK::SSH do
 
     end
 
-  end if !ENV['CI'] && !ENV['TRAVIS']
+  end
 
   describe "proxy SSH behaviour" do
 
@@ -515,7 +527,13 @@ describe ZTK::SSH do
         File.exists?(remote_file) && File.delete(remote_file)
 
         local_file = File.join("/tmp", "ssh-upload-local")
-        IO.write(local_file, data)
+        if RUBY_VERSION < "1.9.3"
+          File.open(local_file, 'w') do |file|
+            file.puts(data)
+          end
+        else
+          IO.write(local_file, data)
+        end
 
         File.exists?(remote_file).should == false
         subject.upload(local_file, remote_file)
@@ -545,7 +563,13 @@ describe ZTK::SSH do
         File.exists?(local_file) && File.delete(local_file)
 
         remote_file = File.join("/tmp", "ssh-download-remote")
-        IO.write(remote_file, data)
+        if RUBY_VERSION < "1.9.3"
+          File.open(remote_file, 'w') do |file|
+            file.puts(data)
+          end
+        else
+          IO.write(remote_file, data)
+        end
 
         File.exists?(local_file).should == false
         subject.download(remote_file, local_file)
@@ -557,6 +581,6 @@ describe ZTK::SSH do
 
     end
 
-  end if !ENV['CI'] && !ENV['TRAVIS']
+  end
 
 end

data/spec/ztk/template_spec.rb

@@ -32,13 +32,47 @@ describe ZTK::Template do
 
   end
 
-  describe "behaviour" do
+  describe "methods" do
+
+    describe "do_not_edit_notice" do
+
+      it "should render the notice with no options" do
+        result = subject.do_not_edit_notice
+        result.should =~ /WARNING: AUTOMATICALLY GENERATED FILE; DO NOT EDIT!/
+        result.should =~ /Generated @/
+        result.should =~ /#/
+      end
+
+      it "should render the notice with our message inside" do
+        message = "Hello World"
+        result = subject.do_not_edit_notice(:message => message)
+        result.should =~ /WARNING: AUTOMATICALLY GENERATED FILE; DO NOT EDIT!/
+        result.should =~ /Generated @/
+        result.should =~ /#/
+        result.should =~ /#{message}/
+      end
+
+      it "should allow us to change the comment character" do
+        message = "Hello World"
+        char = "ZZ"
+        result = subject.do_not_edit_notice(:message => message, :char => char)
+        result.should =~ /WARNING: AUTOMATICALLY GENERATED FILE; DO NOT EDIT!/
+        result.should =~ /Generated @/
+        result.should =~ /#{message}/
+        result.should =~ /#{char}/
+      end
+
+    end
+
+    describe "render" do
+
+      it "should render the template with the supplied context" do
+        template_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "test-template.txt.erb"))
+        context = { :test_variable => "Hello World" }
+        output = subject.render(template_file, context)
+        output.should == "Hello World"
+      end
 
-    it "should render the template with the supplied context" do
-      template_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "test-template.txt.erb"))
-      context = { :test_variable => "Hello World" }
-      output = subject.render(template_file, context)
-      output.should == "Hello World"
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -228,6 +228,7 @@ files:
 - lib/ztk/ui.rb
 - lib/ztk/version.rb
 - spec/spec_helper.rb
+- spec/support/before_install.sh
 - spec/support/test-config.rb
 - spec/support/test-template.txt.erb
 - spec/ztk/background_spec.rb
@@ -263,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3687907436918424858
+      hash: -4478842353570464598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -272,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3687907436918424858
+      hash: -4478842353570464598
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -281,6 +282,7 @@ specification_version: 3
 summary: Zachary's (DevOp) Tool Kit
 test_files:
 - spec/spec_helper.rb
+- spec/support/before_install.sh
 - spec/support/test-config.rb
 - spec/support/test-template.txt.erb
 - spec/ztk/background_spec.rb