watson-ruby 1.5.1 → 1.6.0

data/lib/watson/bitbucket.rb

@@ -5,9 +5,6 @@ module Watson
     # and post issues to Bitbucket
     class Bitbucket
 
-    # Debug printing for this class
-    DEBUG = false
-
     class << self
 
     # [todo] - Allow closing of issues from watson? Don't like that idea but maybe

data/lib/watson/command.rb

@@ -3,9 +3,6 @@ module Watson
   # Controls program flow and parses options given by command line
   class Command
 
-    # Debug printing for this class
-    DEBUG = false
-
     class << self
 
     # Include for debug_print
@@ -26,18 +23,33 @@ module Watson
       _flag_list = %w[
         -c --context-depth
         -d --dirs
+        --debug
         -f --files
+        --format
         -h --help
         -i --ignore
         -p --parse-depth
         -r --remote
         -s --show
         -t --tags
-        --format
         -u --update
         -v --version
       ]
 
+      # Add debug prints based on --debug flag
+      if (_index = args.index('--debug')) != nil
+        _debug_mode = Array.new
+        _index += 1
+        until _flag_list.include?(args[_index]) ||  _index > (args.length - 1)
+          _debug_mode.push(args[_index].downcase)
+          _index += 1
+        end
+        # Slice out so we can ignore in regular CLI parsing
+        args.slice!(args.index('--debug') ... _index)
+
+        Watson.debug_mode = _debug_mode
+      end
+
 
       # If we get the version or help flag, ignore all other flags
       # Just display these and exit
@@ -46,7 +58,6 @@ module Watson
       return version      if args.index('-v') != nil  || args.index('--version') != nil
 
 
-
       # If not one of the above then we are performing actual watson stuff
       # Create all the necessary watson components so we can perform
       # all actions associated with command line args
@@ -179,6 +190,8 @@ module Watson
 
          -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]
@@ -441,7 +454,7 @@ module Watson
 
       # 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?
+      if @config.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
@@ -461,6 +474,12 @@ module Watson
         print BOLD + "GitLab Repo : " + RESET + "#{ @config.gitlab_repo }\n\n" + RESET
       end
 
+      if !@config.asana_api.empty?
+        print BOLD + "Asana API Key : " + RESET + "#{ @config.asana_api }\n" + RESET
+        print BOLD + "Asana Workspace : " + RESET + "#{ @config.asana_workspace }\n" + RESET
+        print BOLD + "Asana Project : " + RESET + "#{ @config.asana_project }\n\n" + RESET
+      end
+
       # If github or bitbucket passed, setup
       # If just -r (0 args) do nothing and only have above printed
       # If more than 1 arg is passed, unrecognized, warn user
@@ -478,6 +497,10 @@ module Watson
           debug_print "GitLab setup called from CL\n"
           Watson::Remote::GitLab.setup(@config)
 
+        when "asana"
+          debug_print "Asana setup called from CL\n"
+          Watson::Remote::Asana.setup(@config)
+
         end
       elsif args.length > 1
         formatter.print_status "x", RED

data/lib/watson/config.rb

@@ -7,9 +7,6 @@ module Watson
     # Include for debug_print
     include Watson
 
-    # Debug printing for this class
-    DEBUG = false
-
     # [review] - Combine into single statement (for performance or something?)
     # [todo] - Add config options (rc file) for default max depth and context lines
 
@@ -21,6 +18,8 @@ module Watson
     attr_accessor :file_list
     # List of tags to look for when parsing
     attr_accessor :tag_list
+    # List of custom filetypes to accept
+    attr_accessor :type_list
     # Number of directories to parse recursively
     attr_accessor :parse_depth
     # Number of lines of issue context to grab
@@ -70,6 +69,17 @@ module Watson
     # Hash to hold list of all Bitbucket issues associated with repo
     attr_accessor :bitbucket_issues
 
+    # Flag for whether Asana access is avaliable
+    attr_accessor :asana_valid
+    # Asana API Key
+    attr_accessor :asana_api
+    # Asana workspace
+    attr_accessor :asana_workspace
+    # Asana project within the workspace to place issues
+    attr_accessor :asana_project
+    # Hash to hold list of all Asana issues associated with repo
+    attr_accessor :asana_issues
+
 
     # Flag for whether GitLab access is avaliable
     attr_accessor :gitlab_valid
@@ -119,6 +129,7 @@ module Watson
       @dir_list     = Array.new()
       @file_list    = Array.new()
       @tag_list     = Array.new()
+      @type_list    = Hash.new()
       @issue_count  = 0
 
       # Remote options
@@ -147,8 +158,16 @@ module Watson
       @gitlab_issues   = Hash.new()
 
 
+      @asana_valid     = false
+      @asana_api       = ""
+      @asana_workspace = ""
+      @asana_project   = ""
+      @asana_issues    = Hash.new()
+
 
       @output_format = Watson::Formatters::DefaultFormatter
+
+
     end
 
 
@@ -176,6 +195,11 @@ module Watson
       unless @gitlab_api.empty? && @gitlab_repo.empty?
         Remote::GitLab.get_issues(self)
       end
+
+      unless @asana_api.empty? && @asana_project.empty? && @asana_workspace.empty?
+        Remote::Asana.get_issues(self)
+      end
+
     end
 
 
@@ -207,40 +231,41 @@ module Watson
 
     ###########################################################
     # Watson config creater
-    # Copies default config from /assets/defaultConf to the current directory
+    # Attempts to create config based on $HOME/.watsonrc
+    # If this doesn't exist, copies default config from /assets/defaultConf to $HOME and current directory
     def create_conf
     # [review] - Not sure if I should use the open/read/write or Fileutils.cp
 
       # Identify method entry
       debug_print "#{ self.class } : #{ __method__ }\n"
 
-
-      # Generate full path since File doesn't care about the LOAD_PATH
+      # Full path to assets/defaultConf (File class doesn't look at LOAD_PATH)
       # [review] - gsub uses (.?)+ to grab anything after lib (optional), better regex?
       _full_path = __dir__.gsub(%r!/lib/watson(.?)+!, '') + "/assets/defaultConf"
       debug_print "Full path to defaultConf (in gem): #{ _full_path }\n"
 
-      # Check to make sure we can access the default file
-      if !Watson::FS.check_file(_full_path)
-        print "Unable to open #{ _full_path }\n"
-        print "Cannot create default, exiting...\n"
-        return false
+      # $HOME/.watsonrc exists, '~' should be crossplatform with File.expand_path
+      _home_path = File.expand_path('~') + '/.watsonrc'
+
+      # Obtain default config to write to current directory
+      if Watson::FS.check_file(_home_path)
+        _default = File.open(_home_path, 'r') { |file| file.read }
+        debug_print ".watsonrc found in $HOME, using as base\n"
+      elsif Watson::FS.check_file(_full_path)
+        _default = File.open(_full_path, 'r') { |file| file.read }
+        # Write default to $HOME
+        File.open(_home_path, 'w') { |file| file.write(_default) }
+        debug_print ".watsonrc not found in $HOME, using assets\n"
       else
-        # Open default config file in read mode and read into temp
-        _input = File.open(_full_path, 'r')
-        _default = _input.read
-
-        # Open rc file in current directory in write mode and write default
-        _output = File.open(@rc_file, 'w')
-        _output.write(_default)
-
-        # Close both default and new rc files
-        _input.close
-        _output.close
-
-        debug_print "Successfully wrote defaultConf to current directory\n"
-        return true
+        print "Unable to find .watsonrc in $HOME or #{ _full_path}\n"
+        print "Cannot create a default config, exiting...\n"
+        return false
       end
+
+      # Open @rc_file and write the default contents to it
+      File.open(@rc_file, 'w') { |file| file.write(_default) }
+      debug_print "Successfully wrote defaultConf to current directory\n"
+      true
     end
 
 
@@ -370,6 +395,16 @@ module Watson
           debug_print "@tag_list --> #{ @tag_list }\n"
 
 
+        when "type"
+          # Regex to grab ".type" => ["param1", "param2"]
+          _mtch = _line.match(/(\"\S+\")\s+=>\s+(\[(\".+\")+\])/)
+          if !_mtch.nil?
+            _ext = _mtch[1].gsub(/\"/, '')
+            _type = JSON.parse(_mtch[2])
+            @type_list[_ext] = _type
+          end
+
+
         when "ignore"
           # Same as previous for ignores
           # [review] - Populate @tag_list, then check size instead
@@ -441,6 +476,20 @@ module Watson
           @gitlab_repo = _line.chomp!
           debug_print "GitLab Repo: #{ @gitlab_repo }\n"
 
+        when "asana_project"
+          @asana_project = _line.chomp!
+          debug_print "Asana Project: #{ @asana_project }\n"
+
+        when "asana_api"
+          @asana_api = _line.chomp!
+          debug_print "Asana API: #{ @asana_api }\n"
+
+        when "asana_workspace"
+          @asana_workspace = _line.chomp!
+          debug_print "Asana Workspace: #{ @asana_workspace }\n"
+
+
+
         else
           debug_print "Unknown tag found #{_section}\n"
         end
@@ -555,3 +604,8 @@ module Watson
   end
 end
 
+if __FILE__ == $0
+    @config = Watson::Config.new
+end
+
+

data/lib/watson/formatters/base_formatter.rb

@@ -1,7 +1,6 @@
 module Watson::Formatters
   class BaseFormatter
     include Watson
-    DEBUG = false
 
     def initialize(config)
       @config = config

data/lib/watson/formatters/default_formatter.rb

@@ -171,6 +171,15 @@ module Watson::Formatters
             MESSAGE
         end
 
+        if _AS = @config.asana_issues[issue[:md5]]
+          debug_print "Found #{ issue[:title]} in remote issues\n"
+          completed = _AS[:state]
+
+          cprint <<-MESSAGE.gsub(/^(\s+)/, '').chomp
+          #{BOLD}[#{RESET}#{completed ? GREEN : RED}#{BOLD}AS##{_AS[:id]}#{RESET}#{BOLD}]#{RESET}
+          MESSAGE
+        end
+
 
         cprint "\n"
       end

data/lib/watson/fs.rb

@@ -3,9 +3,6 @@ module Watson
   # Contains all methods for file access in watson
   class FS
 
-    # Debug printing for this class
-    DEBUG = false
-
     class << self
     # [todo] - Not sure whether to make check* methods return FP
     #      Makes it nice to get it returned and use it but

data/lib/watson/github.rb

@@ -5,9 +5,6 @@ module Watson
     # and post issues to GitHub
     class GitHub
 
-    # Debug printing for this class
-    DEBUG = false
-
     class << self
 
     # [todo] - Allow closing of issues from watson? Don't like that idea but maybe
@@ -102,6 +99,10 @@ module Watson
         return false
       end
 
+      # Label for Auth Token
+      print BOLD + "Auth Token Label (leave blank to ignore): " + RESET
+      _label = $stdin.gets.chomp
+
       _endpoint = "https://api.github.com" if _endpoint.empty?
 
       # HTTP Request to get OAuth Token
@@ -117,7 +118,7 @@ module Watson
         :method     => "POST",
         :basic_auth => [_username, _password],
         :data       => {"scopes" => ["repo"],
-                        "note" => "watson",
+                        "note" => "watson - #{_label}",
                         "note_url" => "http://watson.goosecode.com/" },
         :verbose    => false
       }

data/lib/watson/gitlab.rb

@@ -5,9 +5,6 @@ module Watson
     # and post issues to GitLab
     class GitLab
 
-    # Debug printing for this class
-    DEBUG = false
-
     class << self
 
     # [todo] - Keep asking for user data until valid instead of leaving app

data/lib/watson/parser.rb

@@ -12,9 +12,6 @@ module Watson
     require 'digest'
     require 'pp'
 
-    # Debug printing for this class
-    DEBUG = false
-
     ###########################################################
     # Initialize the parser with the current watson config
     def initialize(config)
@@ -406,10 +403,15 @@ module Watson
                '.lua'     => ['--', '--[['],      # Lua
                '.vim'     => ['"'],               # VimL
                '.md'      => ['<!--'],            # Markdown
-               '.html'    => ['<!--']             # HTML
+               '.html'    => ['<!--'],            # HTML
+               '.el'      => [';']                # Emacslisp
              }
 
-      loop do
+      # Merge config file type list with defaults
+      _ext.merge!(@config.type_list)
+      
+
+       loop do
         _mtch = filename.match(/(\.(\S+))$/)
         debug_print "Extension: #{ _mtch }\n"
 

data/lib/watson/printer.rb

@@ -25,9 +25,6 @@ module Watson
     # Include for debug_print (for class methods)
     include Watson
 
-    # Debug printing for this class
-    DEBUG = false
-
     ###########################################################
     # Printer initialization method to setup necessary parameters, states, and vars
     def initialize(config)

data/lib/watson/remote.rb

@@ -2,9 +2,6 @@ module Watson
   # Remote class that handles all remote HTTP calls to Bitbucket and GitHub
   class Remote
 
-    # Debug printing for this class
-    DEBUG = false
-
     class << self
 
     # Include for debug_print
@@ -129,7 +126,7 @@ module Watson
     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)
+      return false if !config.remote_valid || (!config.asana_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
@@ -140,6 +137,7 @@ module Watson
             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
+            Remote::Asana.post_issue(issue, config)     if config.asana_valid
             formatter.print_status "!", GREEN
             print BOLD + "Remote Posting Status: #{counter += 1} / #{config.issue_count}"
             print "\r"

data/lib/watson/version.rb

@@ -1,3 +1,3 @@
 module Watson
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

data/spec/config_spec.rb

@@ -98,6 +98,12 @@ describe Config do
       @config.bitbucket_repo.should == ''
       @config.bitbucket_issues.should == Hash.new()
 
+      @config.asana_valid.should be_false
+      @config.asana_api.should == ''
+      @config.asana_workspace.should == ''
+      @config.asana_project.should == ''
+      @config.asana_issues.should == Hash.new()
+
     end
   end