watson-ruby 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37f247838098885b504b1c38a06b9776a240ab51
-  data.tar.gz: 5d3a653d18d972768b6e172ccb4568f54338faf8
+  metadata.gz: 8a65947ab759c4844295dddd2d5c907ae7712ca8
+  data.tar.gz: e49e231ba4cf0cb5c98a7ce3e69af5000350119a
 SHA512:
-  metadata.gz: fd8993cb5cfb517b785e5f018effbfd4b8a3aefb251259c54d30d14df0f9a2cd0fcd9c94ac11b0e1ce1fe2a6053816752c319a572c9d74279d8fb3da340066e1
-  data.tar.gz: 7734757b7c3b2ba986be3f86c82dcc57d0da2fc0c43f43f20d43d85890de0f22e6390f14a99f0d563d596d0defc3ca469e4d11a186534cff8ac53ffcd2b9d39b
+  metadata.gz: a62c2fa1a530131b54fd43bb6893a33bfa3fdf3d57d3f09b8f1f600e9d888a8dd1739456573a052fbb01bf430a9923670cf20a92921fafbfbd24127eb3ddd025
+  data.tar.gz: c623d74ef56e48cf65e00de763c6efc82e13ed2a1cc780be9af90be0227f9eedcfb6b055d9f39a4455ece375b7a3ef76b51321973b8959dc90e06070a80dc6a3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    watson-ruby (1.1.1)
+    watson-ruby (1.1.2)
       json
 
 GEM

data/lib/watson.rb

@@ -6,6 +6,7 @@ require_relative 'watson/printer'
 require_relative 'watson/remote'
 require_relative 'watson/github'
 require_relative 'watson/bitbucket'
+require_relative 'watson/version'
 
 module Watson
   # [todo] - Replace all regex parentheses() with brackets[] if not matching

data/lib/watson/command.rb

@@ -161,58 +161,54 @@ module Watson
     ###########################################################
     # Print help for watson
     def help
-    # [todo] - Add bold and colored printing
+      # [todo] - Add bold and colored printing
 
       # Identify method entry
       debug_print "#{ self } : #{ __method__ }\n"
 
-      print BOLD;
-      print "Usage: watson [OPTION]...\n"
-      print "Running watson with no arguments will parse with settings in RC file\n"
-      print "If no RC file exists, default RC file will be created\n"
-
-      print "\n"
-      print "   -c, --context-depth   number of lines of context to provide with posted issue\n"
-      print "   -d, --dirs            list of directories to search in\n"
-      print "   -f, --files           list of files to search in\n"
-      print "   -h, --help            print help\n"
-      print "   -i, --ignore          list of files, directories, or types to ignore\n"
-      print "   -p, --parse-depth     depth to recursively parse directories\n"
-      print "   -r, --remote          list / create tokens for Bitbucket/GitHub\n"
-      print "   -s, --show            whether to show [all, clean, dirty] files\n"
-      print "   -t, --tags            list of tags to search for\n"
-      print "   -u, --update          update remote repos with current issues\n"
-      print "   -v, --version      print watson version and info\n"
-      print "\n"
-
-      print "Any number of files, tags, dirs, and ignores can be listed after flag\n"
-      print "Ignored files should be space separated\n"
-      print "To use *.filetype identifier, encapsulate in \"\" to avoid shell substitutions \n"
-      print "\n"
-
-      print "Report bugs to: watson\@goosecode.com\n"
-      print "watson home page: <http://goosecode.com/projects/watson>\n"
-      print "[goosecode] labs | 2012-2013\n"
-      print RESET;
+      puts <<-HELP.gsub(/^ {,6}/, '')
+      #{BOLD}Usage: watson [OPTION]...
+      Running watson with no arguments will parse with settings in RC file
+      If no RC file exists, default RC file will be created
+
+         -c, --context-depth   number of lines of context to provide with posted issue
+         -d, --dirs            list of directories to search in
+         -f, --files           list of files to search in
+         -h, --help            print help
+         -i, --ignore          list of files, directories, or types to ignore
+         -p, --parse-depth     depth to recursively parse directories
+         -r, --remote          list / create tokens for Bitbucket/GitHub
+         -t, --tags            list of tags to search for
+         -u, --update          update remote repos with current issues
+         -v, --version      print watson version and info
+
+      Any number of files, tags, dirs, and ignores can be listed after flag
+      Ignored files should be space separated
+      To use *.filetype identifier, encapsulate in \"\" to avoid shell substitutions
+
+      Report bugs to: watson\@goosecode.com
+      watson home page: <http://goosecode.com/projects/watson>
+      [goosecode] labs | 2012-2013#{RESET}
+      HELP
 
       return true
-
     end
 
 
     ###########################################################
     # Print version information about watson
     def version
-
       # Identify method entry
       debug_print "#{ self } : #{ __method__ }\n"
 
-      print "watson v1.0\n"
-      print "Copyright (c) 2012-2013 goosecode labs\n"
-      print "Licensed under MIT, see LICENSE for details\n"
-      print "\n"
+      puts <<-VERSION.gsub(/^ {,6}/, '')
+      watson v#{::Watson::VERSION}
+      Copyright (c) 2012-2013 goosecode labs
+      Licensed under MIT, see LICENSE for details
+
+      Written by nhmood, see <http://goosecode.com/projects/watson>
+      VERSION
 
-      print "Written by nhmood, see <http://goosecode.com/projects/watson>\n"
       return true
     end
 
@@ -279,8 +275,8 @@ module Watson
         if !Watson::FS.check_dir(_dir)
           print "Unable to open #{ _dir }\n"
         else
-          # Clean up directory path
-          _dir = _dir.match(/^((\w+)?\.?\/?)+/)[0].gsub(/(\/)+$/, "")
+          # Clean up path, remove trailing forward slashes
+          _dir = _dir.gsub(/(\/)+$/, "")
           if !_dir.empty?
             debug_print "Adding #{ _dir } to config dir_list\n"
             @config.dir_list.push(_dir)
@@ -463,10 +459,13 @@ module Watson
         end
       elsif args.length > 1
         Printer.print_status "x", RED
-        print BOLD + "Incorrect arguments passed\n" + RESET
-        print "      Please specify either Github or Bitbucket to setup remote\n"
-        print "      Or pass without argument to see current remotes\n"
-        print "      See help (-h/--help) for more details\n"
+        puts <<-SUMMERY.gsub(/^ {,8}/, '')
+        #{BOLD}Incorrect arguments passed#{RESET}
+        Please specify either Github or Bitbucket to setup remote
+        Or pass without argument to see current remotes
+        See help (-h/--help) for more details
+        SUMMERY
+
         return false
       end
     end

data/lib/watson/parser.rb

@@ -135,6 +135,21 @@ module Watson
       Dir.glob("#{ _glob_dir }{*, .*}").select { |_fn| File.directory?(_fn) }.sort.each do |_entry|
         debug_print "Entry: #{ _entry } is a dir\n"
 
+        # Check if entry is in ignore list
+        _skip = false
+        @config.ignore_list.each do |_ignore|
+          if  _entry == _ignore || File.absolute_path(_entry) == _ignore
+            debug_print "#{ _entry } is on the ignore list, setting to \"\"\n"
+            _skip = true
+          end
+        end
+
+        # If directory is on the ignore list then skip
+        if _skip == true
+          _completed_dirs = []
+          _completed_files = []
+          next
+        end
 
         ## Depth limit logic
         # Current depth is depth of previous parse_dir (passed in as second param) + 1
@@ -145,11 +160,13 @@ module Watson
         if @config.parse_depth == 0
           debug_print "No max depth, parsing directory\n"
           _completed_dirs.push(parse_dir("#{ _entry }/", _cur_depth))
-          # If current depth is less than limit (set in config), parse directory and pass depth
+        
+        # If current depth is less than limit (set in config), parse directory and pass depth
         elsif _cur_depth < @config.parse_depth.to_i + 1
           debug_print "Depth less than max dept (from config), parsing directory\n"
           _completed_dirs.push(parse_dir("#{ _entry }/", _cur_depth))
-          # Else, depth is greater than limit, ignore the directory
+       
+        # Else, depth is greater than limit, ignore the directory
         else
           debug_print "Depth greater than max depth, ignoring\n"
         end

data/lib/watson/version.rb

@@ -1,3 +1,3 @@
 module Watson
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watson-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - nhmood