drg 0.14.3 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcfba0400c2db2e1a03310eb1283a46eee235f8c
-  data.tar.gz: c5ebe017de7b5ad902e8f572f0d5d271566f34c0
+  metadata.gz: 237cf5d636b5f61623d98f0de080baf9eee6ec1a
+  data.tar.gz: ef2cff5a52e8a897e2bcc12579c5eb5fcd7217c8
 SHA512:
-  metadata.gz: 0ebc05ba36eae6d52d2cf9a17ab063ebb639ca324f5890435adedc198d30d10912a61bebe55f399ad7c1282795d091b66a468b06b27575ee821ea341cb2607f5
-  data.tar.gz: 3017a31f9100ec3eb7eb69f81c12349b2b220ff413bfc8097935dbad38787d0395af11b5fdbda6e6d071503ed50a4782f8ddc59daaa445829b17154f3fbad025
+  metadata.gz: f737cf78ee76ee24f33e365c2d21948253785d34708aeca2bdfb0e66658dab5d4939c9a55e4cf0a1455562c65a56acd013814b4b525f934921350e5fca7f6f67
+  data.tar.gz: 7c1fcda522637511851f0d6a582171bfa30e78b0f57485a1ecebc492ec4b36145f19519dfb2724dfb2a883a548b9c432fad86ef3c00367d9a0af7f2016928459

data/lib/drg/ruby/condition.rb

@@ -19,14 +19,20 @@ class DRG::Ruby::Condition
   end
 
   def return_value
+    edit find_return_value
+  end
+
+  def find_return_value
     if @statement =~ /\s+\?\s+(.*?)(:|$)/
       $1.strip
+    elsif @statement[/then\n(.+)\nend/]
+      $1.strip
     else
-      translate @statement[/(.*?)(unless|if)/, 1].to_s.strip
+      @statement[/(.*?)(unless|if)/, 1].to_s.strip
     end
   end
 
-  def translate(txt)
+  def edit(txt)
     txt.sub! /^return\s*/, 'returns '
     txt.sub! /^returns\s*$/, 'returns nil'
     if txt.split(/\s/).length == 1

data/lib/drg/spec.rb

@@ -2,6 +2,10 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
   # = Class
   # generate a rspec file based on existing code
 
+  def self.default_indent_size
+    2
+  end
+
   def self.generate(file)
     spec = DRG::Spec.new(file)
     return if spec.funcs.empty? # nothing to do
@@ -44,7 +48,7 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
   end
 
   def collect_contexts(condition, indent = '', contexts = [])
-    new_indent = indent + '  '
+    new_indent = indent + (' ' *  self.class.default_indent_size)
     contexts << %Q(#{indent}context #{quote(tr(condition.short_statement))} do) << %Q(#{new_indent}before {})
     unless condition.return_value.empty?
       contexts << %Q(#{new_indent}it #{quote(condition.return_value)} do) << %Q(#{new_indent}end)
@@ -61,7 +65,7 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
   def quote(txt)
     txt.strip!
     if txt =~ /"/
-      "%Q(#{txt})"
+      "%Q[#{txt.gsub(/\#\{(.*?)\}/m, '@\1')}]"
     else
       %Q("#{txt}")
     end
@@ -79,7 +83,7 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
     phrase.sub! /^if /, 'when '
     phrase.sub! /^not if /, 'unless '
     phrase.sub! /^if not /, 'unless '
-    phrase.sub! %r"then$", ''
+    phrase.sub! /then$/, ''
     if phrase !~ /^(when|unless|not)/
       phrase = "when #{phrase}"
     end

data/lib/drg/tasks/log.rb

@@ -3,8 +3,8 @@ module DRG
     module Log
       module_function
 
-      def log(msg = nil)
-        say %Q(  * <%= color('#{msg}', :green) %>)
+      def log(msg = nil, color = :green)
+        say %Q(  <%= color('#{msg}', :#{color}) %>)
       end
     end
   end

data/lib/drg/tasks/spec_runner.rb

@@ -18,13 +18,18 @@ module DRG
           file_path = Pathname.new(File.expand_path(ruby_file))
           spec = DRG::Spec.generate(file_path)
           unless spec
-            log "Skipping #{file_path}: no methods found"
+            log "- #{ruby_file} - no methods", :gray
             next
           end
           rspec_file = Pathname.new(spec_file(ruby_file))
-          log "Generating #{rspec_file}"
+          spec_file_path = rspec_file.to_s[%r|/(spec/.+)|, 1]
+          if rspec_file.exist?
+            log "- #{spec_file_path} - already exists", :gray
+            next
+          end
+          log "+ #{spec_file_path}"
           FileUtils.mkdir_p(rspec_file.parent)
-          File.open(spec_file(ruby_file), 'wb') do |f|
+          File.open(rspec_file, 'wb') do |f|
             f << spec.join("\n")
           end
         end
@@ -44,7 +49,11 @@ module DRG
 
       # @note subbing out /app/ is Rails specific
       def spec_file(ruby_file)
-        File.join(spec_path, "#{ruby_file.sub('.rb', '_spec.rb')}").sub '/app/', '/'
+        File.join(spec_path, "#{specify(ruby_file)}").sub '/app/', '/'
+      end
+
+      def specify(file_name)
+        file_name.sub('.rb', '_spec.rb')
       end
 
       def spec_path

data/lib/drg/version.rb

@@ -1,3 +1,3 @@
 module DRG
-  VERSION = '0.14.3'.freeze
+  VERSION = '0.15.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.0
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser