watson-ruby 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da9382974aee60af64d71f1cc6a63f594330cc12
-  data.tar.gz: 7cb4dbb672ffa04412ae1198ac79c97f0bab6643
+  metadata.gz: 2cb1804dead00fc6ed4ccfc616c4551473fa2376
+  data.tar.gz: 0a56d91f93d36ae4ed03cfec5a3cd0e27779400f
 SHA512:
-  metadata.gz: f5646b1f3b0db3fd820369e7dcb6727d235cec7bdc5be8bcb3fb2d4656265b5611f8be47dc48603f89e8a5206a3156e972b914e6b600b5fcc0b256d8baf16a6b
-  data.tar.gz: 3f17083485b7efee7672483ca889ba23af2fa2811573d2834d31ba2bb5c47f28dee279c5e338627004cdfb7605efa4dc12382ec1cf4c6e132d7884c962fe6248
+  metadata.gz: 1ccdce1f3dd140fc82a608c69a0a0ab12b2d7e9750efb6f7582230f8f6567f52e9720965224131e328342b6975a1e3f36846525d5c9c45f8f8ba2ac487e595cd
+  data.tar.gz: 5291bd22fa3a29657864492e90e24404fa0a968e783866092ec5406dd073cceef991a5b956b83c226b23d55ad7cc526683076062f7b1b9bafe085f41186e6c76

data/Gemfile.lock

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

data/lib/watson/config.rb

@@ -321,7 +321,7 @@ module Watson
         when "context_depth"
           # No need for regex on context value, command should read this in only as a #
           # Chomp to get rid of any nonsense
-          @context_depth = _line.chomp!
+          @context_depth = _line.chomp!.to_i
 
 
         when "parse_depth"

data/lib/watson/github.rb

@@ -128,6 +128,14 @@ module Watson
       if _resp.code == "201"
         formatter.print_status "o", GREEN
         print BOLD + "Obtained OAuth Token\n\n" + RESET
+
+      elsif _resp.code == "401"
+        begin
+          # [todo] - Refactor all
+          _json, _resp = two_factor_authentication(opts, formatter)
+        rescue => e
+          return false
+        end
       else
         formatter.print_status "x", RED
         print BOLD + "Unable to obtain OAuth Token\n" + RESET
@@ -381,6 +389,39 @@ module Watson
       return true
     end
 
+    private
+
+    def two_factor_authentication(opts, formatter)
+      print "\n"
+      print "Two Factor Authentication has been enabled for this account.\n"
+      print BOLD + "Code: " + RESET
+      system "stty -echo"
+      _authcode = $stdin.gets.chomp
+      system "stty echo"
+      print "\n\n"
+      if _authcode.empty?
+        formatter.print_status "x", RED
+        print BOLD + "Input is blank. Please enter your Two Factor Authentication Code!\n\n" + RESET
+        return false
+      end
+      opts[:headers] = [ { :field => "X-GitHub-OTP", :value => _authcode } ]
+      _json, _resp  = Remote.http_call(opts)
+      if _resp.code == "201"
+        formatter.print_status "o", GREEN
+        print BOLD + "Obtained OAuth Token\n\n" + RESET
+        return [_json, _resp]
+      elsif _resp.code == "401"
+        formatter.print_status "x", RED
+        print BOLD + "Unable to obtain OAuth Token\n" + RESET
+        print "      Authentication Code Incorrect!\n\n"
+        false
+      else
+        formatter.print_status "x", RED
+        print BOLD + "Unable to obtain OAuth Token\n" + RESET
+        print "      Status: #{ _resp.code } - #{ _resp.message }\n\n"
+        false
+      end
+    end
     end
     end
   end

data/lib/watson/parser.rb

@@ -84,8 +84,8 @@ module Watson
       debug_print "Parsing through all files/directories in #{ dir }\n"
 
       # [review] - Shifted away from single Dir.glob loop to separate for dir/file
-      # 			 This duplicates code but is much better for readability
-      # 			 Not sure which is preferred?
+      #        This duplicates code but is much better for readability
+      #        Not sure which is preferred?
 
 
       # Remove leading . or ./
@@ -147,12 +147,12 @@ 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
         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
           debug_print "Depth greater than max depth, ignoring\n"
@@ -334,7 +334,7 @@ module Watson
 
         # If GitHub is valid, pass _issue to GitHub poster function
         # [review] - Keep Remote as a static method and pass config every time?
-        #			 Or convert to a regular class and make an instance with @config
+        #       Or convert to a regular class and make an instance with @config
 
 
         # [review] - Use _tag string as symbol reference in hash or keep as string?
@@ -380,6 +380,7 @@ module Watson
                '.class'   => ['//', '/*', '/**'],
                '.cs'      => ['//', '/*'],        # C#
                '.scss'    => ['//', '/*'],        # SASS SCSS
+               '.sass'    => ['//', '/*'],        # SASS SCSS
                '.js'      => ['//', '/*'],        # JavaScript
                '.php'     => ['//', '/*', '#'],   # PHP
                '.m'       => ['//', '/*'],        # ObjectiveC
@@ -403,6 +404,8 @@ module Watson
                '.clj'     => [';;'],              # Clojure
                '.sql'     => ['---', '//', '#' ], # SQL and PL types
                '.lua'     => ['--', '--[['],      # Lua
+               '.vim'     => ['"'],               # VimL
+               '.md'      => ['<!--'],            # Markdown
                '.html'    => ['<!--']             # HTML
              }
 

data/lib/watson/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watson-ruby
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - nhmood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json