watson-ruby 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c34c96ffee2121472d23d7a52d7e2d18e3e8ec2
-  data.tar.gz: 3ff0b2e4488f44809386da142c524c3b92102e48
+  metadata.gz: 514fedab81cf81f62c7a4fb415d83750ebf05ad5
+  data.tar.gz: 4b63e079270286b0fd7bea2a3d1a5fc3e17310ff
 SHA512:
-  metadata.gz: c195675726ac8893b28dca39680622bcf6aa817b94139ea6488599ce4dffccf353b58ebf7198303a8f4621fdfe8f9f29c9dc2e0c31f48a020cfdf74df219330e
-  data.tar.gz: 9fc583eec772f5471e69be16edeca2db5ae4fec5de638acfd6aa6bcb46c45d858047ed262c876b92117f15b6c81efdbb71f314c9660cbd5ae5efba2d4ff996a6
+  metadata.gz: db6f2c055827b284eb40682f5bb137c7ee21cbdb85dde8924f3a2653c9f334922f6493af9c974d603957b0d3901cbd3f80fa31b84ebf8ef0be7a95dcd243dc10
+  data.tar.gz: 14a2b0d85756bb5357c49de86029be86d6a467f955d687af9269326049196809d16d342cc41b49de1dd6ad22ba65ae3924c3923245c60b63eba82aba94a9ff9e

data/Gemfile.lock

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

data/README.md

@@ -1,4 +1,4 @@
-# watson-ruby [![Gem Version](https://badge.fury.io/rb/watson-ruby.png)](http://badge.fury.io/rb/watson-ruby) [![Build Status](https://travis-ci.org/nhmood/watson-ruby.png?branch=master)](https://travis-ci.org/nhmood/watson-ruby) 
+# watson-ruby [![Gem Version](https://badge.fury.io/rb/watson-ruby.png)](http://badge.fury.io/rb/watson-ruby) [![Build Status](https://travis-ci.org/nhmood/watson-ruby.png?branch=master)](https://travis-ci.org/nhmood/watson-ruby)
 
 ### an inline issue manager
 [watson](http://goosecode.com/watson) ([mirror](http://nhmood.github.io/watson-ruby)) is a tool for creating and tracking bug reports, issues, and internal notes in code.  
@@ -8,11 +8,11 @@ It is avaliable in two flavors, [watson-ruby](http://github.com/nhmood/watson-ru
 ### See the RDoc documentation [here](http://goosecode.com/watson/ruby/doc/) ([mirror](http://nhmood.github.io/watson-ruby/ruby/doc/))
 
 ## Installation
-watson-ruby has been tested with **Ruby v2.0.0p247** and **RubyGems v2.0.3** (on **Arch Linux**)  
+watson-ruby has been tested with **Ruby v2.1** and **RubyGems v2.0.3** (on **Arch Linux**)  
 watson-ruby requires the ```json``` gem
 
 ### From Repo
-watson-ruby is avaliable as a RubyGems ([link](https://rubygems.org/gems/watson-ruby)).  
+watson-ruby is avaliable as a RubyGems ([link](https://rubygems.org/gems/watson-ruby)).
 You can either download it directory from ```gem``` using
 ```
 gem install watson-ruby
@@ -38,10 +38,10 @@ bundle exec rake
 
 ## Usage
 For a quick idea of how to use watson, check out the [app demo](http://goosecode.com/watson)! ([mirror](http://nhmood.github.io/watson-ruby))  
-See below for a description of what all the command line arguments do.  
+See below for a description of what all the command line arguments do.
 
 ### Supported Languages
-If you see something missing from the list please either file an issue or  
+If you see something missing from the list please either file an issue or
 submit a pull request (comment parsing happens in **lib/watson/paser.rb**)
 
 - **C / C++**
@@ -69,6 +69,7 @@ submit a pull request (comment parsing happens in **lib/watson/paser.rb**)
 - **Markdown**
 - **HTML**
 - **Emacslisp**
+- **LaTex**
 
 
 ## Command line arguments
@@ -79,36 +80,37 @@ If no RC file exists, default RC file will be created
 
    -c, --context-depth   lines of context to provide with posted issue
    -d, --dirs            list of directories to search in
+   --debug               enable debug prints from specified class
+                         all debug prints enabled if no arguments passed
    -f, --files           list of files to search in
    --format              set output format for watson
                          [print, json, unite, silent]
    -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 remote posting
-                         [github, bitbucket, gitlab, asana]
+   -r, --remote          list / create tokens for Bitbucket/GitHub
    -s, --show            filter results (files listed) based on issue status
                          [all, clean, dirty]
    -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>
+watson home page: <http://goosecode.com/watson>
 [goosecode] labs | 2012-2013
 
+
 ```
 ### All file/directory/tag related parameters support relative as well as absolute paths.
 
 ### -c, --context-lines [LINES]
 This parameter specifies how many lines of context watson should include when posting issues to remote repos.  
 When this parameter is set from the command line, the .watsonrc config file is written with the value; the command line option effectively sets the default value for this feature in the current directory.  
-The default value is set to 15 (and can be found in the lib/watson/command.rb file).  
+The default value is set to 15 (and can be found in the lib/watson/command.rb file).
 
 
 ### -d, --dirs [DIRS]
@@ -120,7 +122,7 @@ If watson is run without this parameter, the current directory is parsed.
 ### --debug [CLASS]
 This parameter enables debug prints for the specified class.  
 It should be followed by a space separated list of classes that should print debug messages.  
-The list of classes are found in `lib/watson`.
+The list of classes are found in `lib/watson`.  
 If passed without arguments, debug prints in **ALL** classes of watson will be enabled.  
 
 
@@ -134,19 +136,19 @@ This parameter specifies how watson should output the issues that it finds.
 If passed with `print`, the regular printing will occur, either to Unix less or STDOUT (depending on system).  
 If passed with `json`, the output will be in the form of JSON, and will be stored in `.watsonresults`.  
 
-- This particular option is useful if attempting to intergrate watson into other tools / platforms.
+- This particular option is useful if attempting to intergrate watson into other tools / platforms.  
 
 If passed with `unite`, the output will be compatible with the unite.vim plugin  
 (see the **Unite** section below or visit [alpaca-tc/vim-unite-watson](https://github.com/alpaca-tc/vim-unite-watson.vim)
 
 If passed with `silent`, watson will have no output.  
 
-- This particular option is useful if remote posting to GitHub, Bitbucket, or GitLab is desired without the visual component of watson.  
+- This particular option is useful if remote posting to GitHub, Bitbucket, or GitLab is desired without the visual component of watson.
 - For example, you could set up a **git commit hook** to post issues to GitHub/Bitbucket/GitLab, but avoid the giant print out every time.
 
 
 ### -h, --help
-This parameter displays the list of avaliable options for watson.  
+This parameter displays the list of avaliable options for watson.
 
 
 ### -i, --ignore [IGNORES]
@@ -159,13 +161,13 @@ This parameter should be used as an opposite to -d/-f, when there are more files
 This parameter specifies how deep watson should recursively parse directories.  
 The 'depth' is defined as how many levels deep from the top-most specified directory to parse.  
 If individual directories are passed with the -d (--dirs) flag, each will be parsed PARSE_DEPTH layers, regardless of their depth from the current directory.  
-If watson is run without this parameter, the parsing depth is unlimited and will search through all subdirectories found.  
+If watson is run without this parameter, the parsing depth is unlimited and will search through all subdirectories found.
 
 
 ### -r, --remote [GITHUB, BITBUCKET, GITLAB, ASANA]
 This parameter is used to both list currently established remotes as well as setup new ones.  
 If passed without any options, the currently established remotes will be listed.  
-If passed with a github, bitbucket, gitlab, asana argument, watson will proceed to ask some questions to set up the corresponding remote.
+If passed with a github, bitbucket, gitlab, asana argument, watson will proceed to ask some questions to set up the corresponding remote.  
 
 
 ### -s, --show [ALL, CLEAN, DIRTY]
@@ -194,19 +196,21 @@ This parameter displays the current version of watson you are running.
 watson supports an RC file that allows for reusing commong settings without repeating command line arguments every time.  
 
 The .watsonrc is placed in every directory that watson is run from as opposed to a unified file (in ~/.watsonrc for example). The thought process behind this is that each project may have a different set of folders to ignore, directories to search through, and tags to look for.  
-For example, a C/C++ project might want to look in src/ and ignore obj/ whereas a Ruby project might want to look in lib/ and ignore assets/.  
+For example, a C/C++ project might want to look in src/ and ignore obj/ whereas a Ruby project might want to look in lib/ and ignore assets/.
 
 A base `.watsonrc` is created in the users `$HOME` directory and used as the template for creating all subsequent config files.  
 Any changes made in the `$HOME/.watsonrc` will carry on towards new configs, but will **not** update previously created configs.  
 The `$HOME/.watsonrc` is directly copied, not merged, as to avoid confusion as to the source of config parameters.  
+The `$HOME/.watsonrc` contains all remote GitHub API tokens created. The individual project `.watsonrc` will contain only the username
+associated with the API token, and will reference `$HOME/.watsonrc` to obtain the API token on runtime.
 
 The .watsonrc file is fairly straightforward...  
-**[dirs]** - This is a newline separated list of directories to look in while parsing.  
+**[dirs]** - This is a newline separated list of directories to look in while parsing.
 
-**[tags]** - This is a newline separated list of tags to look for while parsing.  
+**[tags]** - This is a newline separated list of tags to look for while parsing.
 
-**[ignore]** - This is a newline separated list of files / folders to ignore while parsing.    
-This supports wildcard type selecting by providing .filename (no * required)  
+**[ignore]** - This is a newline separated list of files / folders to ignore while parsing.  
+This supports wildcard type selecting by providing .filename (no * required)
 
 **[context_depth]** - This value determines how many lines of context should be grabbed for each issue when posting to a remote.
 
@@ -216,12 +220,20 @@ The format of filetype entries should be
 ".type"   => ["comment1", "comment2"]
 ".nhmood" => ["@@", "***"]
 ".cc"     => ["//"]
-```  
+```
+
+**[show_type]** - This field allows for setting the default show type, similar to the -s/--show command line arg  
+If set to `clean`, only files that watson did *NOT* find issues in will be displayed.  
+If set to `dirty`, only files that watson *DID* find issues in will be displayed.  
+If set to `all`, watson will display all files, regardless of their issue status.  
+The default behavior of watson is the `all` option.  
+
+**[tag_format]** - Customize the tag format for your project. Defaults to `[TAG] - COMMENT`. "TAG" and "COMMENT" are required keywords.
 
-**[(github/bitbucket/gitlab/asana)_api]** - If a remote is established, the API key for the corresponding remote is stored here.
-Currently, OAuth has yet to be implemented for Bitbucket so the Bitbucket username is stored here.  
+**[(github/bitbucket/gitlab/asana)_api]** - If a remote is established, the API key for the corresponding remote is stored here.  
+Currently, OAuth has yet to be implemented for Bitbucket so the Bitbucket username is stored here.
 
-**[(github/bitbucket/gitlab)_repo]** - The repo name / path is stored here.  
+**[(github/bitbucket/gitlab)_repo]** - The repo name / path is stored here.
 
 **[(github/gitlab)_endpoint]** - The endpoint in case of GitHub Enterprise of GitLab configuration.
 
@@ -229,19 +241,19 @@ Currently, OAuth has yet to be implemented for Bitbucket so the Bitbucket userna
 
 **[asana_workspace]** - The Asana workspace in case of Asana integration is stored here.
 
-The remote related .watsonrc options shouldn't need to be edited manually, as they are automatically populated when the -r, --remote setup is called.  
+The remote related .watsonrc options shouldn't need to be edited manually, as they are automatically populated when the -r, --remote setup is called.
 
 ## unite.vim
-### [vim-unite-watson.vim](https://github.com/alpaca-tc/vim-unite-watson.vim) by [alpaca-tc](http://github.com/alpaca-tc)
+### [vim-unite-watson.vim](https://github.com/alpaca-tc/vim-unite-watson.vim) by [alpaca-tc](http://github.com/alpaca-tc)  
 **alpaca-tc** was kind enough to create a [unite.vim](https://github.com/Shougo/unite.vim) plugin to integrate with watson!  
 **unite.vim** allows you to create user interfaces within vim and lets you search and display any kind of information.  
-The **unite-vim-watson.vim** plugin allows you to:
+The **unite-vim-watson.vim** plugin allows you to:  
 
-  - Generate a list of issues directly inside vim
-  - Search and select files displayed in the watson output
-  - Jump directly to the line where the issue is located (!!)
+  - Generate a list of issues directly inside vim  
+  - Search and select files displayed in the watson output  
+  - Jump directly to the line where the issue is located (!!)  
 
-If you use vim I ***definitely*** recommend using **vim-unite-watson.vim**, it works wonders for productivity!
+If you use vim I ***definitely*** recommend using **vim-unite-watson.vim**, it works wonders for productivity!  
 
 ### See it in action [here (GIF demo)](https://github.com/alpaca-tc/vim-unite-watson.vim)
 
@@ -251,7 +263,7 @@ Special thanks to [@eugenekolo](http://twitter.com/eugenekolo) [[email](eugenek@
 Special thanks to [@crowell](http://github.com/crowell) for testing out watson-ruby!  
 
 ## FAQ
-- **Will inline issues get deleted if I close them on GitHub/Bitbucket/GitLab?**
+- **Will inline issues get deleted if I close them on GitHub/Bitbucket/GitLab?**  
   No, watson won't touch your source code, it will only inform you that issues have been closed remotely.
 
 - **Why Ruby?**  

data/lib/watson/command.rb

@@ -450,20 +450,31 @@ module Watson
       formatter = Printer.new(@config).build_formatter
       formatter.print_header
 
+      # Get $HOME/.watsonrc to check for remotes
+      _home_conf = Watson::Config.home_conf
+
       print BOLD + "Existing Remotes:\n" + RESET
 
       # Check the config for any remote entries (GitHub or Bitbucket) and print
       # We *should* always have a repo + API together, but API should be enough
-      if @config.github_api.empty? && @config.bitbucket_api.empty? && @config.asana_api.empty?
+      if _home_conf.github_api.empty? && @config.bitbucket_api.empty? && @config.asana_api.empty?
         formatter.print_status "!", YELLOW
         print BOLD + "No remotes currently exist\n\n" + RESET
       end
 
-      if !@config.github_api.empty?
-        print BOLD + "GitHub User : " + RESET + "#{ @config.github_api }\n"
+      unless _home_conf.github_api.empty?
+        print BOLD + "- GitHub APIs -\n" + RESET
+        _home_conf.github_api.each_with_index do |_api, _i|
+          print BOLD + "#{_i+1}. #{_api[0]}" + RESET + " : #{_api[1]}\n"
+        end
+        print "\n\n"
+      end
+
+      unless @config.github_repo.empty?
         print BOLD + "GitHub Repo : " + RESET + "#{ @config.github_repo }\n\n"
       end
 
+
       if !@config.bitbucket_api.empty?
         print BOLD + "Bitbucket User : " + RESET + "#{ @config.bitbucket_api }\n" + RESET
         print BOLD + "Bitbucket Repo : " + RESET + "#{ @config.bitbucket_repo }\n\n" + RESET

data/lib/watson/config.rb

@@ -4,12 +4,26 @@ module Watson
   # that are accessed throughout watson
   class Config
 
+    class << self
+      def home_conf
+      # Return Conf object for $HOME/.watsonrc
+        _home_conf = Watson::Config.new()
+        _home_conf.rc_file = File.expand_path('~') + '/.watsonrc'
+        _home_conf.read_conf
+        return _home_conf
+      end
+    end
+
+
     # Include for debug_print
     include Watson
 
     # [review] - Combine into single statement (for performance or something?)
     # [todo] - Add config options (rc file) for default max depth and context lines
 
+    # Location of .watsonrc, modified when working with remote API tokens
+    attr_accessor :rc_file
+
     # List of all files/folders to ignore when parsing
     attr_accessor :ignore_list
     # List of directories to parse
@@ -18,6 +32,8 @@ module Watson
     attr_accessor :file_list
     # List of tags to look for when parsing
     attr_accessor :tag_list
+    # Tag format for look for
+    attr_accessor :tag_format
     # List of custom filetypes to accept
     attr_accessor :type_list
     # Number of directories to parse recursively
@@ -132,11 +148,13 @@ module Watson
       @type_list    = Hash.new()
       @issue_count  = 0
 
+      @tag_format = "[TAG] - COMMENT"
+
       # Remote options
       @remote_valid   = false
 
       @github_valid    = false
-      @github_api      = ""
+      @github_api      = Hash.new
       @github_endpoint = ""
       @github_repo     = ""
       @github_issues   = Hash.new()
@@ -394,6 +412,9 @@ module Watson
           end
           debug_print "@tag_list --> #{ @tag_list }\n"
 
+        when "tag_format"
+          @tag_format = _line.chomp!
+          debug_print @tag_format
 
         when "type"
           # Regex to grab ".type" => ["param1", "param2"]
@@ -427,10 +448,43 @@ module Watson
           debug_print "@ignore_list --> #{ @ignore_list }\n"
 
 
+        when "show_type"
+          # No need for parsing, just check case
+
+          case _line.chomp.downcase
+          when "clean"
+            @show_type = "clean"
+            debug_print "@show_type set to \"clean\" from config\n"
+
+          when "dirty"
+            @show_type = "dirty"
+            debug_print "@show_type set to \"dirty\" from config\n"
+
+          else
+            @show_type = "all"
+            debug_print "@show_type set to \"all\" from config\n"
+
+          end
+
+
+        # Project directories reference $HOME/.watsonrc for GitHub API token
+        # If we don't find a username=token format string, use username
+        # as Hash reference to $HOME/.watsonrc --> github_api
         when "github_api"
-          # No need for regex on API key, GitHub setup should do this properly
-          # Chomp to get rid of any nonsense
-          @github_api = _line.chomp!
+          # Regex for username=token
+          _mtch = _line.chomp.match(/(\S+)=(\S+)/)
+
+          # If no = match, then it is a hash reference
+          if _mtch.nil?
+            _home = Watson::Config.home_conf
+            @github_api[_line.chomp] = _home.github_api[_line.chomp]
+
+          # If we do find match, this is a $HOME/.watsonrc
+          # Populate home conf with all API tokens
+          else
+            @github_api[_mtch[1]] = _mtch[2]
+          end
+
           debug_print "GitHub API: #{ @github_api }\n"
 
 
@@ -511,7 +565,7 @@ module Watson
 
       # Check if RC exists, if not create one
       if !Watson::FS.check_file(@rc_file)
-        print "Unable to open #{ @rc_file }, exiting\n"
+        print "Unable to open #{ @rc_file }, attempting to create\n"
         create_conf
       else
         debug_print "Opened #{ @rc_file } for reading\n"
@@ -592,15 +646,48 @@ module Watson
       end
 
       # Now that we have skipped all the things that need to be updated, write them in
-      params.each do | _param |
-        _update.write("[#{ _param }]\n")
-        _update.write("#{ self.instance_variable_get("@#{ _param }") }")
+      params.each do | _name |
+        _update.write("[#{ _name }]\n")
+        _param = self.instance_variable_get("@#{ _name }")
+
+        if _param.is_a?(Hash)
+          # If the config file we are dealing with is in $HOME/.watsonrc
+          # then write as username=token, else write just username
+          pp(_param)
+          if @rc_file == File.expand_path('~') + '/.watsonrc'
+            _param.each do |val|
+              _update.write("#{val[0]}=#{val[1]}\n")
+            end
+          else
+            _param.each do |val|
+              _update.write("#{val[0]}\n")
+            end
+          end
+
+        elsif _param.is_a?(Array)
+          _param.each do |val|
+            _update.write("#{val}\n")
+          end
+
+        else
+          _update.write("#{_param}\n")
+        end
+
         _update.write("\n\n\n")
       end
 
       _update.close
     end
 
+
+    
+    ###########################################################
+    # Get first key from API list (hash)
+    def github_token
+      self.github_api[github_api.keys[0]]
+    end
+
+
   end
 end
 

data/lib/watson/github.rb

@@ -16,6 +16,7 @@ module Watson
     # Include for debug_print
     include Watson
 
+
     #############################################################################
     # Setup remote access to GitHub
     # Get Username, Repo, and PW and perform necessary HTTP calls to check validity
@@ -25,21 +26,52 @@ module Watson
       debug_print "#{ self.class } : #{ __method__ }\n"
 
       formatter = Printer.new(config).build_formatter
+      
+      # Create new RC for $HOME/.watsonrc and check for existing remotes there
+      _home_conf = Watson::Config.home_conf
+
+      return false if !get_token(config, _home_conf, formatter)
+      return false if !get_repo(config, formatter)
+
+      # Give user some info
+      print "\n"
+      formatter.print_status "o", GREEN
+      print BOLD + "GitHub successfully setup\n" + RESET
+      print "      Issues will now automatically be retrieved from GitHub by default\n"
+      print "      Use -u, --update to post issues to GitHub\n"
+      print "      See help or README for more details on GitHub/Bitbucket access\n\n"
+
+      true
+    end
+
+
+    #############################################################################
+    # Obtain API token fom GitHub
+    # Either generate new Auth Token or use existing for current dir/project 
+    def get_token(config, home_conf, formatter)
+
+      # Avaliable GitHub APIs
+      _github = home_conf.github_api
+      
       formatter.print_status "+", GREEN
       print BOLD + "Obtaining OAuth Token for GitHub...\n" + RESET
 
-      # Check config to make sure no previous API exists
-      unless config.github_api.empty? && config.github_repo.empty? && config.github_endpoint.empty?
-        formatter.print_status "!", RED
-        print BOLD + "Previous GitHub API + Repo is in RC, are you sure you want to overwrite?\n" + RESET
-        print "      (Y)es/(N)o: "
+      unless _github.empty?
+        formatter.print_status "!", YELLOW
+        print BOLD + "Previous GitHub APIs found do you want to use one that is listed?\n" + RESET
+        print "      Enter # of API key (blank will create new): "
 
         # Get user input
-        _overwrite = $stdin.gets.chomp
-        if ["no", "n"].include?(_overwrite.downcase)
-          print "\n\n"
+        unless (_api = $stdin.gets.chomp).empty?
+          print "\n"
+          _api = _api.to_i - 1
+          
+          # Return specified API token if # selected is valid
+          return _github[_github.keys[_api]] if _api >= 0 && _api < _github.length
+
           formatter.print_status "x", RED
-          print BOLD + "Not overwriting current GitHub API + repo info\n" + RESET
+          print BOLD + "Invalid API selected\n" + RESET
+          print "      Make sure the correct # was selected from the list!\n" + RESET
           return false
         end
       end
@@ -53,6 +85,7 @@ module Watson
       print BOLD + "Is this a GitHub Enterprise account?\n" + RESET
       print "      (Y)es/(N)o: "
 
+
       # Get user input
       _enterprise = $stdin.gets.chomp
       if ["yes", "y"].include?(_enterprise.downcase)
@@ -144,13 +177,32 @@ module Watson
         return false
       end
 
+      # Add to $HOME/.watsonrc and current .watsonrc
+      home_conf.github_api[_username] = _json["token"]
+      home_conf.update_conf("github_api")
+
       # Store endpoint and API key obtained from POST to @config.github_api
       config.github_endpoint = _endpoint
-      config.github_api = _json["token"]
+
+      # If we are currently in $HOME then don't touch the .watsonrc
+      # [todo] - Better way of selecting API if in $HOME, or just don't use in $HOME...
+      unless Dir.pwd.eql?(File.expand_path('~'))
+        config.github_api = {_username => _json["token"]}
+        config.update_conf("github_api", "github_endpoint")
+      end
+
+
       debug_print "Config GitHub API Endpoint updated to: #{ config.github_endpoint }\n"
       debug_print "Config GitHub API Key updated to:      #{ config.github_api }\n"
 
+      true
+    end
+
 
+    #############################################################################
+    # Obtain repo info for GitHub
+    # Set repo for current dir/project
+    def get_repo(config, formatter)
       # Get repo information, if blank give error
       formatter.print_status "!", YELLOW
       print BOLD + "Repo information required\n" + RESET
@@ -186,10 +238,10 @@ module Watson
       #
       # Auth token
       opts = {
-        :url        => "#{ _endpoint }/repos/#{ _owner }/#{ _repo }/labels",
+        :url        => "#{ config.github_endpoint }/repos/#{ _owner }/#{ _repo }/labels",
         :ssl        => true,
         :method     => "POST",
-        :auth       => config.github_api,
+        :auth       => config.github_token,
         :data       => {"name" => "watson",
                         "color" => "00AEEF" },
         :verbose    => false
@@ -217,6 +269,7 @@ module Watson
 
       # Store owner/repo obtained from POST to @config.github_repo
       config.github_repo = "#{ _owner }/#{ _repo }"
+      config.update_conf("github_repo")
       debug_print "Config GitHub API Key updated to: #{ config.github_repo }\n"
 
       # Inform user of label creation status (created above)
@@ -234,21 +287,7 @@ module Watson
         print "      Status: #{ _resp.code } - #{ _resp.message }\n"
       end
 
-      # All setup has been completed, need to update RC
-      # Call config updater/writer from @config to write config
-      debug_print "Updating config with new GitHub info\n"
-      config.update_conf("github_api", "github_repo", "github_endpoint")
-
-      # Give user some info
-      print "\n"
-      formatter.print_status "o", GREEN
-      print BOLD + "GitHub successfully setup\n" + RESET
-      print "      Issues will now automatically be retrieved from GitHub by default\n"
-      print "      Use -u, --update to post issues to GitHub\n"
-      print "      See help or README for more details on GitHub/Bitbucket access\n\n"
-
-      return true
-
+      true
     end
 
 
@@ -278,7 +317,7 @@ module Watson
         :url        => "#{ config.github_endpoint }/repos/#{ config.github_repo }/issues?labels=watson",
         :ssl        => true,
         :method     => "GET",
-        :auth       => config.github_api,
+        :auth       => config.github_token,
         :verbose    => false
       }
 
@@ -361,7 +400,7 @@ module Watson
         :url        => "#{ config.github_endpoint }/repos/#{ config.github_repo }/issues",
         :ssl        => true,
         :method     => "POST",
-        :auth       => config.github_api,
+        :auth       => config.github_token,
         :data       => { "title" => issue[:title] + " [#{ issue[:path] }]",
                          "labels" => [issue[:tag], "watson"],
                          "body" => _body },

data/lib/watson/parser.rb

@@ -208,8 +208,15 @@ module Watson
       # [review] - It is possible to embed the valid tags in the regexp,
       # with a ~5% performance gain, but this would loose the warning about
       # unrecognized tags.
-      _comment_regex = /^[[#{ _comment_type }]+?\s+?]+\[(\w+)\]\s+-\s+(.+)/
+      _tag_format = Regexp.escape(@config.tag_format).gsub('\\ ', ' ')
+      _tag_format_regex = _tag_format
+                              .gsub("TAG", '(\w+)')
+                              .gsub("COMMENT", '(.+)')
+                              .gsub(' ' , '\s+')
 
+      _comment_regex = /^(?:\s*[#{_comment_type}]+\s*)+#{_tag_format_regex}/
+
+      debug_print "Comment regex: #{_comment_regex}\n"
 
       # Open file and read in entire thing into an array
       # Use an array so we can look ahead when creating issues later
@@ -245,7 +252,7 @@ module Watson
         end
 
         # Set tag
-        _tag = _mtch[1]
+        _tag = _mtch[1].downcase
 
         # Make sure that the tag that was found is something we accept
         # If not, skip it but tell user about an unrecognized tag
@@ -409,7 +416,8 @@ module Watson
                '.el'      => [';'],               # Emacslisp
                '.sqf'     => ['//','/*'],         # SQF
                '.sqs'     => [';'],               # SQS
-               '.d'       => ['//','/*']          # D
+               '.d'       => ['//','/*'],         # D
+               '.tex'     => ['%']                # LaTex
              }
 
       # Merge config file type list with defaults

data/lib/watson/version.rb

@@ -1,3 +1,3 @@
 module Watson
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/spec/config_spec.rb

@@ -86,10 +86,12 @@ describe Config do
       @config.file_list.should == []
       @config.tag_list.should == []
 
+      @config.tag_format.should == "[TAG] - COMMENT"
+
       @config.remote_valid.should be_false
 
       @config.github_valid.should be_false
-      @config.github_api.should == ''
+      @config.github_api.should == Hash.new()
       @config.github_repo.should == ''
       @config.github_issues.should == Hash.new()
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: watson-ruby
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - nhmood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: an inline issue manager with GitHub and Bitbucket support
@@ -59,8 +59,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -104,17 +104,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: an inline issue manager