drg 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b762ca2893927b7c8daa8f20f406b94cc9aad2f
-  data.tar.gz: ccd11fadf6b920aabf92352cdf326a913a6de90c
+  metadata.gz: 8088ff21bcf344deaf9426041abe5010e50323b1
+  data.tar.gz: a1b79e42fcd4f995d4b50c7ae5cbe37e2082579f
 SHA512:
-  metadata.gz: 27a26be99bed739f410282a8f161713d7c3066b8a50a04902b783e33b667dbfa1654bee482aab0d0b4c4359bf4441e714c15fb86d3249225bf7a8ba16fb5fd53
-  data.tar.gz: 984f714b1a1371c4e71420c11cfa61b6a98e2c5fa119872bf1d3c94de4c536b7567bc386540ce7e0240e1af66035660734cbf6b3447bf81031b13e665ba9dae4
+  metadata.gz: b70bb0f245de6a2f573ab681277a3059406c41361d3913b54c09416546b88d1c2f0ff111d9533b30c7211c7922647adfc8ebaf432160aacf36db76e5c6102f7f
+  data.tar.gz: 3fd5f8dd60e0557065bcec396d66633ca53ae3f1f57c652d57b3908f3165855603d2a21fb6be43f9fec278d88f33377e759e308041a0ce814c8514a08c5559f3

data/README.md

@@ -77,11 +77,11 @@ describe Ability do
   subject { described_class.new user }
 
   describe "#initialize" do
-    context "when user.luna?" do
+    context "when user.admin?" do
       before {}
     end
 
-    context "unless user.luna?" do
+    context "unless user.admin?" do
       before {}
     end
   end

data/bin/console

@@ -2,36 +2,9 @@
 
 require 'bundler/setup'
 require 'pp'
-
-# require 'ruby2ruby'
-# require 'ruby_parser'
-
 require 'rspec'
+require 'irb'
 require 'object_tracker'
 require_relative '../spec/spec_helper'
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require 'pry'
-# Pry.start
-require 'irb'
-
-def sexp
-  ruby      = File.readlines(FIXTURE_ROOT.join 'report.rb').join
-  parser    = RubyParser.new
-  ruby2ruby = Ruby2Ruby.new
-  parser.process(ruby)
-  # ruby2ruby.process(sexp)
-end
-
-def sexp_spec
-  ruby      = File.readlines(FIXTURE_ROOT.join 'report_spec.rb').join
-  parser    = RubyParser.new
-  ruby2ruby = Ruby2Ruby.new
-  parser.process(ruby)
-  # ruby2ruby.process(sexp)
-end
-
 IRB.start

data/lib/drg/ruby/condition.rb

@@ -7,13 +7,7 @@ class DRG::Ruby::Condition
   def initialize(sexp)
     @sexp = sexp
     @statement = Ruby2Ruby.new.process(sexp.deep_clone)
-    @nested_conditions = Set.new
-    sexp.drop(1).flatten.include?(:if) && sexp.drop(1).deep_each do |exp|
-      DRG::Decorators::SexpDecorator.new(exp).each_sexp_condition do |node|
-        @nested_conditions << self.class.new(node)
-      end
-    end
-    @nested_conditions = @nested_conditions.to_a
+    @nested_conditions = create_nested_conditions
   end
 
   def short_statement
@@ -49,4 +43,19 @@ class DRG::Ruby::Condition
   def hash
     sexp.object_id
   end
+
+  #
+  # Private
+  #
+
+  def create_nested_conditions
+    nc = Set.new
+    s = sexp.drop(1)
+    s.flatten.include?(:if) && s.deep_each do |exp|
+      DRG::Decorators::SexpDecorator.new(exp).each_sexp_condition do |node|
+        nc << self.class.new(node)
+      end
+    end
+    nc.to_a
+  end
 end

data/lib/drg/ruby/const.rb

@@ -1,13 +1,13 @@
 require 'ruby_parser'
 
 class DRG::Ruby::Const
-  CONSTANT_DEFS = { :class => :class, :module => :module, :cdecl => :class }
+  CONSTANT_DEFS = { class: :class, module: :module, cdecl: :class }
 
   attr_reader :sexp
 
   # @param [Sexp] sexp
   def initialize(sexp)
-    sexp = sexp.select { |x| x.is_a?(Array) }.last if sexp[0] == :block
+    sexp = sexp[2] if sexp[0] == :block
     @sexp = sexp
   end
 

data/lib/drg/ruby.rb

@@ -11,7 +11,7 @@ module DRG
 
     attr_reader :sexp, :const
 
-    # @param [Pathname] file
+    # @param [Pathname, String] file
     def initialize(file)
       @sexp = RubyParser.new.parse File.read(file)
       @const = DRG::Ruby::Const.new(sexp)

data/lib/drg/version.rb

@@ -1,3 +1,3 @@
 module DRG
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.14.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drg
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Ryan Buckley
@@ -147,17 +147,12 @@ files:
 - lib/drg.rb
 - lib/drg/decorators.rb
 - lib/drg/decorators/sexp_decorator.rb
-- lib/drg/file_context.rb
-- lib/drg/file_reader.rb
-- lib/drg/judge.rb
-- lib/drg/let.rb
 - lib/drg/ruby.rb
 - lib/drg/ruby/class_func.rb
 - lib/drg/ruby/condition.rb
 - lib/drg/ruby/const.rb
 - lib/drg/ruby/func.rb
 - lib/drg/ruby/instance_func.rb
-- lib/drg/scanner.rb
 - lib/drg/spec.rb
 - lib/drg/tasks.rb
 - lib/drg/tasks/active_pinner.rb

data/lib/drg/file_context.rb

@@ -1,205 +0,0 @@
-module DRG
-  class FileContext
-    # = Class
-    # First attempt at reading ruby files. It was a pipe dream. See DRG::Ruby for the real stuff ;)
-    #
-
-    attr_writer :lines
-
-    def initialize
-      @lines = Set.new
-      @is_private = false
-    end
-
-    def add(raw_line, index = 0)
-      line_number = index + 1
-      line = parse_line(raw_line, line_number)
-      @lines << line
-      line
-    end
-
-    def inspect
-      %Q(#<DRG::FileContext:#{object_id} @lines=#{@lines.count}>, @is_private=false, @is_protected=false>)
-    end
-
-    def lines
-      @lines.to_a
-    end
-
-=begin
-
-def set_name *args
-def get_name
-def [](other)
-def +
-def -
-def <=>
-def /
-def eql?
-
-=end
-    def parse_line(line, line_number)
-      case line.to_s.chomp.strip
-      when /\A(=begin|=end)/
-        nil
-      when /class\s+([A-Z]+\w*)/
-        return ClassDef.new($1, line_number)
-      when /module\s+([A-Z]+\w*)/
-        return ModuleDef.new($1, line_number)
-      when /def self\.([a-z0-9\[\]_+-<=>?]+)\s*\(?/
-        # @todo check if within class << self
-        return ClassMethodDef.new($1, line_number, current_class_or_module, @is_private)
-      when /def ([a-z0-9\[\]_+-<=>?]+)\s*\(?/
-        return InstanceMethodDef.new($1, line_number, current_class_or_module, @is_private)
-      when /(.+)\s*(do|\{)(.*)(\}|end)/
-        return BlockDef.new($1, $2, $3, line_number, $4)
-      when /(.+)\s*(do|\{)(.*)/
-        return BlockDef.new($1, $2, $3, line_number)
-      when /#*\s*(private|protected)\b/i
-        @is_private = true
-      when /#*\s*public[\s\n]+/i
-        @is_private = false
-      when /\A(end|\})\b/i
-        close_current_definition unless current_definition.method?
-      else
-        nil
-      end
-      NullLine.new(line)
-    end
-
-    def current_definition
-      lines.reverse.detect { |line| line.open? } || Definition.new
-    end
-
-    def close_current_definition
-      current_definition.close
-    end
-
-    def current_class_or_module
-      current_definition = lines.reverse.detect { |line| line.open? && (line.class? || line.mod?) }
-      current_definition && current_definition.name
-    end
-
-    def classes
-      lines.select { |line| line.class? }
-    end
-
-    def modules
-      lines.select { |line| line.mod? }
-    end
-
-    def blocks
-      lines.select { |line| line.block? }
-    end
-
-    def methods
-      lines.select { |line| line.method? }
-    end
-
-    def last_method
-      lines.reverse.detect { |line| line.method? }
-    end
-
-    def last_class
-      lines.reverse.detect { |line| line.class? }
-    end
-
-    module NullDefinition
-      def class?
-        false
-      end
-
-      def mod?
-        false
-      end
-
-      def method?
-        false
-      end
-
-      def block?
-        false
-      end
-    end
-
-    class NullLine < DelegateClass(String)
-      include NullDefinition
-
-      def eql?(*)
-        false
-      end
-
-      def open?
-        false
-      end
-    end
-
-    class Definition < Object
-      include NullDefinition
-      attr_accessor :open, :name, :line_number
-
-      def initialize(name = nil, line_number = nil, open = true)
-        @name, @line_number, @open = name, line_number.to_i, open
-      end
-
-      def inspect
-        %Q(#<#{self.class.name} #{instance_variables.map { |i| %Q(#{i}="#{instance_variable_get(i)}") }.join(', ')}>)
-      end
-
-      alias to_s inspect
-
-      def eql?(other)
-        @name == other.name && @line_number == other.line_number
-      end
-
-      def close
-        @open = false
-      end
-
-      alias open? open
-      alias hash line_number
-    end
-
-    class MethodDefinition < Definition
-      attr_accessor :class_name, :is_private
-
-      def initialize(name, line_number, class_name, is_private)
-        super(name, line_number, false)
-        @class_name, @is_private = class_name, is_private
-      end
-
-      def method?
-        true
-      end
-    end
-
-    class ClassDef < Definition
-      def class?
-        true
-      end
-    end
-
-    class ModuleDef < Definition
-      def mod?
-        true
-      end
-    end
-
-    class ClassMethodDef < MethodDefinition
-    end
-
-    class InstanceMethodDef < MethodDefinition
-    end
-
-    class BlockDef < Definition
-      def initialize(name, body, opener, line_number, closer = nil)
-        super(name, line_number, !!closer) # not open if closer present (single line block)
-        @body, @opener, @closer, = body, opener, closer
-      end
-
-      def block?
-        true
-      end
-    end
-  end
-end

data/lib/drg/file_reader.rb

@@ -1,44 +0,0 @@
-module DRG
-  class FileReader
-    # = Class
-    # Needs to keep track of the context of the file as we scan each line (e.g. what class the
-    # current method is defined). As well as an efficient way to loop through the lines
-    # @todo add SpecReader
-    #
-
-    include Enumerable
-
-    def initialize(file_path)
-      @file_path = file_path
-    end
-
-    def each
-      return to_enum unless block_given?
-      File.open(@file_path) do |f|
-        while line = f.gets
-          yield line
-        end
-      end
-    end
-
-    def each_with_context
-      return enum_for __method__ unless block_given?
-      @context = nil
-      each_with_index do |line, i|
-        current_line = context.add(line, i)
-        yield current_line, context
-      end
-    end
-
-    def read
-      @context = nil
-      each_with_index do |line, i|
-        context.add(line, i)
-      end
-    end
-
-    def context
-      @context ||= FileContext.new
-    end
-  end
-end

data/lib/drg/judge.rb

@@ -1,19 +0,0 @@
-module DRG
-  class Judge
-    attr_reader :spec, :file
-
-    def initialize(file, spec)
-      @file, @spec = file, spec
-    end
-
-    def missing_methods
-      describes = DRG::Scanner.new(spec).describes
-      DRG::Scanner.new(file).methods.select { |method_name|
-        describes.detect { |describe_name|
-          # turn Report.name or Report#name into .name and #name
-          describe_name[/#{Regexp.escape(method_name.sub(/^\w+(\.|#)/, '\1'))}/i]
-        }.nil?
-      }
-    end
-  end
-end

data/lib/drg/let.rb

@@ -1,4 +0,0 @@
-module DRG
-  class Let < Struct.new(:name, :value)
-  end
-end

data/lib/drg/scanner.rb

@@ -1,69 +0,0 @@
-module DRG
-  autoload :Let, 'drg/let'
-
-  class Scanner
-    attr_reader :file
-
-    def initialize(file)
-      @file = file
-    end
-
-    def lets
-      _lets = []
-      continuation = false
-      File.readlines(file).each do |line|
-        if continuation && continuation = line.strip != 'end'
-          _lets[-1].value << line
-        elsif line =~ /\A\s+let\(?:(\w+)\)?\s*do\s*\n/
-          continuation = true
-          _lets << Let.new($1.strip, '')
-        elsif line =~ /\A\s+let\(?:(\w+)\)?\s*\{(.+)\}/m
-          _lets << Let.new($1.strip, $2.strip)
-        end
-      end
-      _lets
-    end
-
-    def indentation
-      line = nil
-      File.open(file) do |f|
-        previous_line = nil
-        until indent_size(previous_line) != indent_size(line = f.gets)
-          previous_line = line
-        end
-      end
-      indent_size(line)
-    end
-
-    def methods
-      items = []
-      klasses = Set.new
-      File.readlines(file).each do |line|
-        if line =~ /class (\w+)/
-          klasses << $1
-        end
-        case line.to_s.chomp.strip
-        when /#?\s*private/i
-          break
-        when /def (self)?(\.?[a-z0-9_]+)/
-          method_name = $2
-          if method_name !~ /\A\./
-            method_name = "##{method_name}"
-          end
-          items << "#{klasses.to_a.join('::')}#{method_name}"
-        else
-          nil
-        end
-      end
-      items
-    end
-
-    def describes
-      File.readlines(file).map { |line| $2 if line =~ /(describe|context)\s*['"%](.+)\s*['"%]/ }.compact
-    end
-
-    def indent_size(line)
-      line.to_s.chomp.rstrip[/\s{0,}/].size.to_i
-    end
-  end
-end