watson-ruby 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 010d18c7699c27eecd4b22d22c47561ea9d06165
-  data.tar.gz: 5a74c7c250c89de84952b769a118d62629b614c8
+  metadata.gz: b7bda617cab8b88201fc641200b445d7e2bb00ca
+  data.tar.gz: 0495fbacaf6082fbfae13bca095049f120913667
 SHA512:
-  metadata.gz: 4cd17d98b5f73e7d417900a50f1dcaabbbb5b6b433328237d233540eaed3dacf97a1006cdc9c0bf1aefc5f681f059e176dbfcf701e28e4862df98e8ebb5354d0
-  data.tar.gz: b8ae589570ee13514d4932fb5346eee2f77503e3db64da2ad1e0991fb36f2ba555ad23c92ef7d8ac651d498ea8c63162c26d69b2c8734d07d97b89d614d508b4
+  metadata.gz: 6beb97591a44614b91c4b3a9b326889da79894c809abf65d0ecbafe7c41eaa9ca5b475b55cb6f38da8c1efcd98a4386e9e846b9e2b886b0b7537947f4872ee0b
+  data.tar.gz: 1bdc123198f253ed08333773b2f38fd2e2bed481004f58fc395cb1e060a9cc9eba7d6dcf6683f1ad083bb1504393cba9b8718be36c28bbc90409b7e66bed849c

data/Gemfile.lock

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

data/lib/watson/fs.rb

@@ -28,8 +28,8 @@ module Watson
         return false
       end
 
-      # Check if file can be opened
-      if File.readable?(file)
+      # Check if file is actually a file and can be opened
+      if File.file?(file) && File.readable?(file)
         debug_print "#{ file } exists and opened successfully\n"
         return true
       else

data/lib/watson/parser.rb

@@ -209,13 +209,18 @@ module Watson
       _comment_type = get_comment_type(_relative_path)
       unless _comment_type
         debug_print "Using default (#) comment type\n"
-        _comment_type = '#'
+        _comment_type = ['#']
       end
 
+      # Escape out comment type for safety
+      # [review] - Is there a way to do inplace join?
+      _comment_type = _comment_type.map { |comment| Regexp.escape(comment) }.join("|")
+      debug_print "Comment type #{ _comment_type }\n"
+
       # [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+(.+)/
+      _comment_regex = /^[[#{ _comment_type }]+?\s+?]+\[(\w+)\]\s+-\s+(.+)/
 
 
       # Open file and read in entire thing into an array
@@ -390,6 +395,7 @@ module Watson
                '.java'    => ['//', '/*', '/**'], # Java
                '.class'   => ['//', '/*', '/**'],
                '.cs'      => ['//', '/*'],        # C#
+               '.scss'    => ['//', '/*'],        # SASS SCSS
                '.js'      => ['//', '/*'],        # JavaScript
                '.php'     => ['//', '/*', '#'],   # PHP
                '.m'       => ['//', '/*'],        # ObjectiveC
@@ -411,7 +417,8 @@ module Watson
                '.coffee'  => ['#'],               # CoffeeScript
                '.zsh'     => ['#'],               # Zsh
                '.clj'     => [';;'],              # Clojure
-               '.sql'     => ['---', '//', '#' ]  # SQL and PL types
+               '.sql'     => ['---', '//', '#' ], # SQL and PL types
+               '.lua'     => ['--', '--[[']       # Lua
              }
 
       loop do

data/lib/watson/version.rb

@@ -1,3 +1,3 @@
 module Watson
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

metadata

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