barnyard2waldo 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bc85cd037506951f02937deb2453dc149306a2d
-  data.tar.gz: ba2b6f9c1d65bcd50d1b7a514c818b05dc0e5177
+  metadata.gz: e0deca698431c13eb336c3d98c44f54a5ec9872d
+  data.tar.gz: 7437417f46272d822abc232aa2b48b20f4335713
 SHA512:
-  metadata.gz: c6ca42d74fd9943c695bc693961e84263908401a47d01b1a7a8339798e2ab7c28d95f667ce7b50737c08f138b653d3657d6919c29259b3a78d79ae4927700fb5
-  data.tar.gz: a7a4363e33157e58fe7c26c0c5f7b5f424567d79489c9a430d63766fc166d1bc2293aa50c61eae0b30d0b490d684bb2bec20383f9adeed55a40bebc4dbd1c056
+  metadata.gz: bf9d13324bb13b0bf69c8f91be08ddeb244ca1ed62a91d01e813b4081e6159d65bf02b3be517c9267d29a149aac879d68d4db24c2432b273edc44a50d80b0961
+  data.tar.gz: 56bb6ed6f68471c5671a7cf43d313b54fa03404722ee73b50d91e30076336d473efb47708fea91ddd9211ab989128378734b93410a941011070c707ea057c167

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Scott MacGregor
+Copyright (c) 2015 Scott MacGregor
 
 MIT License
 

data/README.md

@@ -30,12 +30,15 @@ Record Idx: 119879
 ## Extended Help
 
 ```shell
-$> waldo -h
+$ waldo -h
 Usage: waldo [OPTIONS]
     -b                               Bookmark file
                                        Default: /var/spool/barnyard.waldo
+    -z                               Print Zulu time (utc)
+                                       Default: false
 Options::
     -h, --help                       Display this screen
+
 ```
 
 ## Reference:

data/lib/barnyard2waldo/cli.rb

@@ -49,10 +49,15 @@ module Barnyard2
           exit
         end
 
-        finder = Barnyard2::Waldo::Where.new(options[:bookmark])
-        finder.utc = options[:utc]
-        puts finder
-
+        begin
+            finder = Barnyard2::Waldo::Where.new(options[:bookmark])
+            finder.utc = options[:utc]
+            puts finder
+        rescue Barnyard2::Waldo::WaldoFilePermissionsError
+            abort "Waldo File Read Perrmission Error, check permissions on the bookmark file."
+        rescue Barnyard2::Waldo::WaldoFileError
+            abort "Waldo File Error, file may not exist."
+        end
       end
 
     end #Class

data/lib/barnyard2waldo/main.rb

@@ -3,6 +3,9 @@ module Barnyard2
 
     class CustomError < StandardError; end
 
+    class WaldoFileError < StandardError; end
+    class WaldoFilePermissionsError < StandardError; end
+
     module Defaults
         Bookmark = '/var/spool/barnyard.waldo'
         UTC = 'false'

data/lib/barnyard2waldo/version.rb

@@ -1,5 +1,5 @@
 module Barnyard2
   module Waldo
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/lib/barnyard2waldo/where.rb

@@ -7,20 +7,27 @@ module Barnyard2
       attr_accessor :utc
 
       def initialize (bookmark=Barnyard2::Waldo::Defaults::Bookmark)
-        fp = open(bookmark, 'rb')
-        s = fp.read(Barnyard2::Waldo::MAX_FILEPATH_BUF)
-        @spool_dir = s.strip
-
-        s = fp.read(Barnyard2::Waldo::MAX_FILEPATH_BUF)
-        @spool_filebase = s.strip
-
-        s = fp.read(Barnyard2::Waldo::UINT32_t)
-        @epoch = s.unpack('V').first
+        raise WaldoFileError unless File.file?(bookmark)
+        raise WaldoFilePermissionsError unless File.stat(bookmark).readable?
+        begin
+            # (r) Read-only, starts at beginning of file  (default mode).
+            # (b) Binary file mode
+            fp = open(bookmark, 'rb')
+            s = fp.read(Barnyard2::Waldo::MAX_FILEPATH_BUF)
+            @spool_dir = s.strip
+
+            s = fp.read(Barnyard2::Waldo::MAX_FILEPATH_BUF)
+            @spool_filebase = s.strip
+
+            s = fp.read(Barnyard2::Waldo::UINT32_t)
+            @epoch = s.unpack('V').first
+
+            s = fp.read(Barnyard2::Waldo::UINT32_t)
+            @record = s.unpack('V').first
+        ensure
+            fp.close
+        end
 
-        s = fp.read(Barnyard2::Waldo::UINT32_t)
-        @record = s.unpack('V').first
-      ensure
-        fp.close
       end
 
       # Unpack the bytes and the array:

data/test/test_waldo.rb

@@ -19,6 +19,7 @@ describe Barnyard2::Waldo::Where do
     it "should return the idx" do
       @where.record.must_equal 119879
     end
+
   end
 
   describe "when asking to print" do
@@ -28,3 +29,36 @@ describe Barnyard2::Waldo::Where do
     end
   end
 end
+
+require 'fileutils'
+
+describe Barnyard2::Waldo::Where do
+
+    describe "when looking at a incorrect file perm" do
+        before do
+            FileUtils.cp_r('test/data/barnyard.waldo', 'test/data/ZZZZZ.waldo')
+            FileUtils.chmod 0000, 'test/data/ZZZZZ.waldo'
+        end
+
+        it "should raise file permission errors" do
+            assert_raises Barnyard2::Waldo::WaldoFilePermissionsError do
+                Barnyard2::Waldo::Where.new('test/data/ZZZZZ.waldo')
+            end
+        end
+
+        after do
+            FileUtils.chmod 0664, 'test/data/ZZZZZ.waldo'
+            FileUtils.rm 'test/data/ZZZZZ.waldo'
+        end    
+    end
+
+    describe "when looking for a bad waldo" do
+
+        it "should raise File existance errors" do
+            assert_raises Barnyard2::Waldo::WaldoFileError do
+                Barnyard2::Waldo::Where.new('test/data/XXXXX.waldo')
+            end
+        end
+
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barnyard2waldo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - shadowbq
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump