mumuki-xgobstones-runner 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b60824133496b2b3b4b76963a33d6c69f876be3
-  data.tar.gz: c5e5ab3d1e63939b482e8f58e4ab96f07b720052
+  metadata.gz: 324a5da17fdeb860ce32d027e217e2d61da836bc
+  data.tar.gz: b3ae4dbec721d9e361f00a91373f40302adc3a58
 SHA512:
-  metadata.gz: 3ce2e40b20fa751de2c5075bd9f38e4391c5526bb26dd2b9c12e36feb39709cbdc1df9dab1ab31c581e920dfc5dbb38ef9d7e5c03b7ad1a8bdada1e981d24d1d
-  data.tar.gz: d08c79d999cbf253ea58bafc636cafb847864085c71cc54e1a85d223395012fb7d1606a7ac71ee0098eebdae4ee8b2071178f8f65e936498f41572d5c4dcc73a
+  metadata.gz: cc57ea97ee85e8a069cad1f57556c5e9635b508a8d05b0c0d0bd92190ee92f12bf8e1542848f1e72361aa59227af01193b1b5b23cdb24c928d43fbf88cfcea23
+  data.tar.gz: 0c3b44a93be33acb90b94188537b5e739517aba4709a10bf87391436acf9a224d3d8c8960821c3aadd13cc7d416e22338d1832cf0f85a4bd96c5edb2227f43d5

data/lib/expectations_hook.rb

@@ -8,11 +8,9 @@ module EvalExpectationsOnAST
   def eval_in_gobstones(binding, ast)
     pattern_generator = expectations[type]
 
-    if pattern_generator
-      !!(ast =~ pattern_generator[binding])
-    else
-      true
-    end
+    result = pattern_generator ? !!(ast =~ pattern_generator[binding]) : true
+
+    negated ? !result : result
   end
 
   def use(regexp)
@@ -30,10 +28,6 @@ module EvalExpectationsOnAST
   def check_repeat_of(target)
     use(/AST\(repeat\s*#{target}/)
   end
-end
-
-class Mumukit::Inspection::PlainInspection
-  include EvalExpectationsOnAST
 
   def expectations
     {
@@ -41,16 +35,7 @@ class Mumukit::Inspection::PlainInspection
       'HasForeach' => use(/AST\(foreach/),
       'HasRepeat' => check_repeat_of('.+'),
       'HasVariable' => use(/AST\(assignVarName/),
-      'HasWhile' => use(/AST\(while/)
-    }
-  end
-end
-
-class Mumukit::Inspection::TargetedInspection
-  include EvalExpectationsOnAST
-
-  def expectations
-    {
+      'HasWhile' => use(/AST\(while/),
       'HasArity' => lambda { |binding| /#{subject_for(binding).ast_regexp}\s*AST\((\s*\w+){#{target}}\)/ },
       'HasRepeatOf' => check_repeat_of("AST\\(literal\\s*#{target}\\)"),
       'HasUsage' => use(/AST\((proc|func)Call\s*#{target}$/)
@@ -58,10 +43,8 @@ class Mumukit::Inspection::TargetedInspection
   end
 end
 
-class Mumukit::Inspection::NegatedInspection
-  def eval_in_gobstones(binding, ast)
-    !@inspection.eval_in_gobstones(binding, ast)
-  end
+class Mumukit::Inspection
+  include EvalExpectationsOnAST
 end
 
 class GobstonesExpectationsHook < Mumukit::Defaults::ExpectationsHook

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-xgobstones-runner
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: mumukit-inspection
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: ruby-stones
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: XGobstones Runner for Mumuki