watson-ruby 1.4.3 → 1.5.0

data/lib/watson/parser.rb

@@ -59,6 +59,9 @@ module Watson
       debug_print PP.pp(_structure, '')
       debug_print "\n\n"
 
+      # Pass structure to poster with count as 0
+      Remote.post_structure(_structure, @config, 0)
+
       _structure
     end
 
@@ -100,23 +103,9 @@ module Watson
         # [review] - Warning to user when file is ignored? (outside of debug_print)
         # Check against ignore list, if match, set to "" which will be ignored
         @config.ignore_list.each do |_ignore|
-          # [review] - Better "Ruby" way to check for "*"?
-          # [review] - Probably cleaner way to perform multiple checks below
-          # Look for *.type on list, regex to match entry
-          if _ignore[0] == '*'
-            _cut = _ignore[1..-1]
-            if _entry.match(/#{ _cut }/)
-              debug_print "#{ _entry } is on the ignore list, setting to \"\"\n"
-              _entry = ''
-              break
-            end
-            # Else check for verbose ignore match
-          else
-            if  _entry == _ignore || File.absolute_path(_entry) == _ignore
-              debug_print "#{ _entry } is on the ignore list, setting to \"\"\n"
-              _entry = ''
-              break
-            end
+          if _mtch = _entry.match(_ignore)
+            _entry = ''
+            break
           end
         end
 
@@ -137,13 +126,15 @@ module Watson
 
         # 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"
+          if mtch = _entry.match(_ignore)
             _skip = true
           end
         end
 
+        debug_print "#{ _entry } was not on ignorelist, adding\n"
+
         # If directory is on the ignore list then skip
         next if _skip == true
 
@@ -273,7 +264,13 @@ module Watson
         # Set flag for this issue_list (for file) to indicate that
         _issue_list[:has_issues] = true
 
-        _title = _mtch[2]
+        # [review] - This could probably be done better, elsewhere!
+        # If it's a HTML comment, remove trailing -->
+        if _mtch[0].match(/<!--/)
+          _title = _mtch[2].gsub(/-->/, "")
+        else
+          _title = _mtch[2]
+        end
         debug_print "Issue found\n"
         debug_print "Tag: #{ _tag }\n"
         debug_print "Issue: #{ _title }\n"
@@ -339,27 +336,13 @@ module Watson
         # [review] - Keep Remote as a static method and pass config every time?
         #			 Or convert to a regular class and make an instance with @config
 
-        if @config.remote_valid
-          if @config.github_valid
-            debug_print "GitHub is valid, posting issue\n"
-            Remote::GitHub.post_issue(_issue, @config)
-          else
-            debug_print "GitHub invalid, not posting issue\n"
-          end
-
-
-          if @config.bitbucket_valid
-            debug_print "Bitbucket is valid, posting issue\n"
-            Remote::Bitbucket.post_issue(_issue, @config)
-          else
-            debug_print "Bitbucket invalid, not posting issue\n"
-          end
-        end
 
         # [review] - Use _tag string as symbol reference in hash or keep as string?
         # Look into to_sym to keep format of all _issue params the same
         _issue_list[_tag].push(_issue)
 
+        # Increment issue counter for posting status
+        @config.issue_count = @config.issue_count.next
       end
 
       # [review] - Return of parse_file is different than watson-perl
@@ -419,11 +402,12 @@ module Watson
                '.zsh'     => ['#'],               # Zsh
                '.clj'     => [';;'],              # Clojure
                '.sql'     => ['---', '//', '#' ], # SQL and PL types
-               '.lua'     => ['--', '--[[']       # Lua
+               '.lua'     => ['--', '--[['],      # Lua
+               '.html'    => ['<!--']             # HTML
              }
 
       loop do
-        _mtch = filename.match(/(\.(\w+))$/)
+        _mtch = filename.match(/(\.(\S+))$/)
         debug_print "Extension: #{ _mtch }\n"
 
         # Break if we don't find a match
@@ -432,7 +416,7 @@ module Watson
         return _ext[_mtch[0]] if _ext.has_key?(_mtch[0])
 
         # Can't recognize extension, keep looping in case of .bk, .#, ect
-        filename = filename.gsub(/(\.(\w+))$/, '')
+        filename = filename.gsub(/(\.(\S+))$/, '')
         debug_print "Didn't recognize, searching #{ filename }\n"
 
       end

data/lib/watson/remote.rb

@@ -19,14 +19,15 @@ module Watson
     # Default options hash for http_call
     # Will get merged with input argument hash to maintain defaults
     HTTP_opts = {
-        :url      => nil,     #--> URL of endpoint [String]
-        :ssl      => false,     #--> Use SSL in connection (HTTPS) (True/False]
-      :method     => nil,     #--> GET or POST for respective HTTP method [String]
+        :url        => nil,           #--> URL of endpoint [String]
+        :ssl        => false,         #--> Use SSL in connection (HTTPS) (True/False]
+        :method     => nil,           #--> GET or POST for respective HTTP method [String]
         :basic_auth => Array.new(0),  #--> Array of username and pw to use for basic authentication
-                                    #    If empty, assume no user authentication [Array]
-      :auth     => nil,     #--> Authentication token [String]
-      :data     => nil,     #--> Hash of data to be POST'd in HTTP request [Hash]
-      :verbose    => false      #--> Turn on verbose debug for this call [True/False]
+                                      #    If empty, assume no user authentication [Array]
+        :auth       => nil,           #--> Authentication token [String]
+        :headers    => Array.new(0),  #--> Array of headers, where headers are hash of key value
+        :data       => nil,           #--> Hash of data to be POST'd in HTTP request [Hash]
+        :verbose    => false          #--> Turn on verbose debug for this call [True/False]
     }
 
     ###########################################################
@@ -81,10 +82,18 @@ module Watson
 
       # Check for Authentication token key in hash to be used in header
       # I think this is pretty universal, but specifically works for GitHub
+      # This is standard for OAuth I think...
       if opts[:auth]
         _req["Authorization"] = "token #{ opts[:auth] }"
       end
 
+      # But sometimes we need we need other headers
+      # Set specific header (GitLab requires PRIVATE_TOKEN)
+      opts[:headers].each do |header|
+        _req["#{ header[:field] }"] = header[:value]
+      end
+
+
       # [review] - Add :data_format to use set_form_data vs json body?
       # For now, use Hash or Array, this is to differentiate between
       # putting post data in body vs putting it in the form
@@ -115,6 +124,38 @@ module Watson
       # return {:json => _json, :resp => _resp}
       return _json, _resp
     end
+
+
+    def post_structure(structure, config, counter)
+
+      # Return if remote isn't valid or both github and bitbucket aren't valid
+      return false if !config.remote_valid || (!config.github_valid && !config.bitbucket_valid && !config.gitlab_valid)
+      formatter = Printer.new(config).build_formatter
+
+      # Parse through entire structure and post issues to remote
+      structure[:files].each do |file|
+        config.tag_list.each do |tag|
+          file[tag].each do |issue|
+
+            Remote::GitHub.post_issue(issue, config)    if config.github_valid
+            Remote::Bitbucket.post_issue(issue, config) if config.bitbucket_valid
+            Remote::GitLab.post_issue(issue, config)    if config.gitlab_valid
+            formatter.print_status "!", GREEN
+            print BOLD + "Remote Posting Status: #{counter += 1} / #{config.issue_count}"
+            print "\r"
+          end
+        end
+      end
+
+      # Pass any dirs we find back to this structure printer and repeat
+      structure[:subdirs].each do |dir|
+        counter = Remote::post_structure(dir, config, counter)
+      end
+
+      # Return counter becaused FixNums are wierd
+      counter
+    end
+
   end
   end
 end

data/lib/watson/version.rb

@@ -1,3 +1,3 @@
 module Watson
-  VERSION = "1.4.3"
+  VERSION = "1.5.0"
 end

data/spec/config_spec.rb

@@ -52,7 +52,6 @@ describe Config do
         @config.read_conf.should be_true
         @config.dir_list.should include('.')
         @config.tag_list.should include('fix', 'review', 'todo')
-        @config.ignore_list.should include('.git', '*.swp')
 
       end
     end
@@ -92,14 +91,12 @@ describe Config do
       @config.github_valid.should be_false
       @config.github_api.should == ''
       @config.github_repo.should == ''
-      @config.github_issues.should == {:open => Hash.new(),
-                       :closed => Hash.new() }
+      @config.github_issues.should == Hash.new()
 
       @config.bitbucket_valid.should be_false
       @config.bitbucket_api.should == ''
       @config.bitbucket_repo.should == ''
-      @config.bitbucket_issues.should == {:open => Hash.new(),
-                       :closed => Hash.new() }
+      @config.bitbucket_issues.should == Hash.new()
 
     end
   end
@@ -107,7 +104,6 @@ describe Config do
   describe '#run' do
     it 'should populate all member vars' do
       @config.run
-      @config.ignore_list.should include('.git', '*.swp')
       @config.tag_list.should include('fix', 'review', 'todo')
       @config.dir_list.should include('.')
     end

data/watson.gemspec

@@ -10,13 +10,13 @@ Gem::Specification.new do |s|
 
   s.authors   = ["nhmood"]
   s.email     = 'nhmood@goosecode.com'
-  s.homepage    = 'http://goosecode.com/watson'
+  s.homepage  = 'http://goosecode.com/watson'
 
-  s.summary   = "an inline issue manager"
+  s.summary     = "an inline issue manager"
   s.description = "an inline issue manager with GitHub and Bitbucket support"
 
-  s.license   = 'MIT'
-  s.files     = `git ls-files`.split("\n").delete_if { |file| file.include?("assets/examples") }
+  s.license     = 'MIT'
+  s.files       = `git ls-files`.split("\n").delete_if { |file| file.include?("assets/examples") }
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watson-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - nhmood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -81,6 +81,7 @@ files:
 - lib/watson/formatters/unite_formatter.rb
 - lib/watson/fs.rb
 - lib/watson/github.rb
+- lib/watson/gitlab.rb
 - lib/watson/parser.rb
 - lib/watson/printer.rb
 - lib/watson/remote.rb