packspec 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a91d9d00afdded57bbe22fe3524fb9106d818fa2
-  data.tar.gz: bb680cb5a60150401afa898ef8b0e99fdd36e55f
+  metadata.gz: 0531ed015b0fcc81e3aa62bac12011f33b69ce9b
+  data.tar.gz: cc8de8f4ac4d27cc08b2fa006bce54a6400c918d
 SHA512:
-  metadata.gz: 8125e9ad5e50615a9bfd050e1d4ae0757f519531f8eb9e13c4da1c328004e6369c51d30d9d4505ed6c1c8e0c4e723e0b94599f838f35ac26cac47b7d9a51a99f
-  data.tar.gz: 5cf94612ce34a3565a64287aa0a27218a8c18ea5ed979226756fdb0f298969b96991e6a89c288761c6453dfa96f94a1a3667bcda3677afee177a3b2588452449
+  metadata.gz: e924e041feab6d6b9c1befc1db57246e3597509eebbf8ee09fe3af06a77c461ad2cf05ef8d605a50b7a076e5339cd47f0bc45288ff01129fb1c3c82540bbdc9f
+  data.tar.gz: a41c8cfd6b471370cba5fe506898ddfdc3fb98c9d8d25243b559be03e023d3fcc8fa6af871d2e647e2d1b6e430b8757ff57fb7f22741a60b47d9f2644493f441

data/lib/cli.rb

@@ -13,22 +13,59 @@ def parse_specs(path)
 
   # Specs
   specmap = {}
-  for path in Dir.glob("#{path}/**/*.yml")
-    spec = parse_spec(File.read(path))
+  for filepath in Dir.glob("#{path}/**/*.yml")
+    spec = parse_spec(File.read(filepath))
     if !spec
       next
     elsif !specmap.include?(spec['package'])
       specmap[spec['package']] = spec
     else
       specmap[spec['package']]['features'].merge!(spec['features'])
+      specmap[spec['package']]['scope'].merge!(spec['scope'])
     end
   end
 
   # Hooks
-  # TODO: implement
+  hookmap = {}
+  for filepath in Dir.glob("#{path}/**/packspec.rb")
+    begin
+      eval(File.read(filepath))
+      hook_scope = Packspec::User.new()
+      for name in hook_scope.public_methods
+        # TODO: filter ruby builtin methods
+        hookmap["$#{name}"] = hook_scope.public_method(name)
+      end
+    rescue Exception
+    end
+  end
 
   # Result
   specs = Array(specmap.sort.to_h.each_value)
+  for spec in specs
+    skip = false
+    spec['ready'] = !spec['scope'].empty?
+    spec['stats'] = {'features' => 0, 'comments' => 0, 'skipped' => 0, 'tests' => 0}
+    for feature, index in spec['features'].dup.each_with_index
+      if feature['assign'] == 'PACKAGE'
+        if index > 0
+          spec['features'].delete_at(index)
+        end
+      end
+      spec['stats']['features'] += 1
+      if feature['comment']
+        skip = feature['skip']
+        spec['stats']['comments'] += 1
+      end
+      feature['skip'] = skip || feature['skip']
+      if !feature['comment']
+        spec['stats']['tests'] += 1
+        if feature['skip']
+            spec['stats']['skipped'] += 1
+        end
+      end
+    end
+    spec['scope'].merge!(hookmap)
+  end
 
   return specs
 
@@ -44,6 +81,15 @@ def parse_spec(spec)
     package = feature['result']
     assert_equal(feature['assign'], 'PACKAGE')
     assert_equal(feature['skip'], nil)
+    if package.is_a?(String)
+      package = {'default' => [package]}
+    elsif package.is_a?(Array)
+      package = {'default' => package}
+    elsif package.is_a?(Hash)
+      for key, value in package.each_pair()
+        package[key] = value.is_a?(Array) ? value : [value]
+      end
+    end
   rescue Exception
     return nil
   end
@@ -57,19 +103,28 @@ def parse_spec(spec)
 
   # Scope
   scope = {}
-  require(package)
-  for item in ObjectSpace.each_object
-    if package == String(item).downcase
-      begin
-        namespace = Kernel.const_get(item)
-      rescue Exception
-        next
-      end
-      for name in namespace.constants
-        scope[String(name)] = namespace.const_get(name)
+  packages = []
+  attributes = {}
+  for namespace, module_names in package.each_pair
+    packages.push(*module_names)
+    namespace_scope = scope
+    if namespace != 'default'
+      if !scope.key?(namespace) then scope[namespace] = {} end
+      namespace_scope = scope[namespace]
+    end
+    for module_name in module_names
+      attributes = get_module_attributes(module_name)
+      namespace_scope.merge!(attributes)
+      if !attributes.empty?
+        break
       end
     end
+    if attributes.empty?
+      scope = {}
+      break
+    end
   end
+  package = packages.sort().join('/')
 
   return {
     'package' => package,
@@ -81,8 +136,16 @@ end
 
 
 def parse_feature(feature)
+
+  # General
   if feature.is_a?(String)
-    return {'comment' => feature}
+    match = /^(?:(.*):)?(\w.*)$/.match(feature)
+    skip, comment = match[1], match[2]
+    if !!skip
+      filters = skip.split(':')
+      skip = (filters[0] == 'not') == (filters.include?('rb'))
+    end
+    return {'assign' => nil, 'comment' => comment, 'skip' => skip}
   end
   left, right = Array(feature.each_pair)[0]
 
@@ -94,7 +157,7 @@ def parse_feature(feature)
     filters = skip.split(':')
     skip = (filters[0] == 'not') == (filters.include?('rb'))
   end
-  if !assign and !property
+  if !assign && !property
     raise Exception.new('Non-valid feature')
   end
   if !!property
@@ -143,7 +206,7 @@ def parse_feature(feature)
     text = "#{text}(#{items.join(', ')})"
   end
   if !!result && !assign
-    text = "#{text} == #{JSON.generate(result)}"
+    text = "#{text} == #{result == 'ERROR' ? result : JSON.generate(result)}"
   end
   text = text.gsub(/{"([^{}]*?)": null}/, '\1')
 
@@ -176,7 +239,6 @@ end
 
 def test_spec(spec)
   passed = 0
-  amount = spec['features'].length
   message = Emoji.find_by_alias('heavy_minus_sign').raw * 3 + "\n\n"
   puts(message)
   for feature in spec['features']
@@ -185,14 +247,14 @@ def test_spec(spec)
       passed += 1
     end
   end
-  success = (passed == amount)
+  success = (passed == spec['stats']['features'])
   color = 'green'
   message = ("\n " + Emoji.find_by_alias('heavy_check_mark').raw + '  ').green.bold
   if !success
     color = 'red'
     message = ("\n " + Emoji.find_by_alias('x').raw + '  ').red.bold
   end
-  message += "#{spec['package']}: #{passed}/#{amount}\n".colorize(color).bold
+  message += "#{spec['package']}: #{passed - spec['stats']['comments'] - spec['stats']['skipped']}/#{spec['stats']['tests'] - spec['stats']['skipped']}\n".colorize(color).bold
   puts(message)
   return success
 end
@@ -215,8 +277,16 @@ def test_feature(feature, scope)
     return true
   end
 
+  # Dereference
+  # TODO: deepcopy feature
+  if !!feature['call']
+    feature['args'] = dereference_value(feature['args'], scope)
+    feature['kwargs'] = dereference_value(feature['kwargs'], scope)
+  end
+  feature['result'] = dereference_value(feature['result'], scope)
+
   # Execute
-  # TODO: dereference feature
+  exception = nil
   result = feature['result']
   if !!feature['property']
     begin
@@ -225,16 +295,23 @@ def test_feature(feature, scope)
         property = get_property(property, name)
       end
       if !!feature['call']
-        # TODO: support kwargs
+        args = feature['args'].dup
+        if !feature['kwargs'].empty?
+          args.push(Hash[feature['kwargs'].map{|k, v| [k.to_sym, v]}])
+        end
         if property.respond_to?('new')
-          result = property.new(*feature['args'])
+          result = property.new(*args)
         else
-          result = property.call(*feature['args'])
+          result = property.call(*args)
         end
       else
         result = property
+        if result.is_a?(Method)
+          result = result.call()
+        end
       end
-    rescue Exception
+    rescue Exception => exc
+      exception = exc
       result = 'ERROR'
     end
   end
@@ -251,7 +328,6 @@ def test_feature(feature, scope)
   end
 
   # Compare
-  # TODO: isoformat value
   if feature['result'] != nil
     success = result == feature['result']
   else
@@ -268,7 +344,12 @@ def test_feature(feature, scope)
       result_text = result.to_s
     end
     message = " #{Emoji.find_by_alias('x').raw}  ".red
-    message += "#{feature['text']} # #{result_text}"
+    message += "#{feature['text']}\n"
+    if exception
+      message += "Exception: #{exception}".red.bold
+    else
+      message += "Assertion: #{result_text} != #{JSON.generate(feature['result'])}".red.bold
+    end
     puts(message)
   end
 
@@ -277,20 +358,31 @@ def test_feature(feature, scope)
 end
 
 
-def dereference_feature(feature, scope)
-    #TODO: deepcopy feature
-    if !!feature['call']
-      feature['args'] = dereference_value(feature['args'], scope)
-      feature['kwargs'] = dereference_value(feature['kwargs'], scope)
+def get_module_attributes(module_name)
+  attributes = {}
+  begin
+    require(module_name)
+  rescue Exception
+    return {}
+  end
+  for item in ObjectSpace.each_object
+    if module_name == String(item).downcase
+      begin
+        module_scope = Kernel.const_get(item)
+      rescue Exception
+        next
+      end
+      for name in module_scope.constants
+        attributes[String(name)] = module_scope.const_get(name)
+      end
     end
-    feature['result'] = dereference_value(feature['result'], scope)
-    return feature
+  end
+  return attributes
 end
 
 
 def dereference_value(value, scope)
-  #TODO: deepcopy value
-  if value.is_a?(Hash) && value.lengh == 1 && Array(value.each_value)[0] == nil
+  if value.is_a?(Hash) && value.length == 1 && Array(value.each_value)[0] == nil
     result = scope
     for name in Array(value.each_key)[0].split('.')
       result = get_property(result, name)
@@ -309,30 +401,26 @@ def dereference_value(value, scope)
 end
 
 
-def isoformat_value(value)
-  # TODO: implement
-  return value
-end
-
-
 def get_property(owner, name)
-  # TODO: review
-  result = nil
-  if owner.is_a?(Hash)
-    result = owner[name]
+  if owner.is_a?(Method)
+    owner = owner.call()
   end
-  if !result
-    result = owner.method(name)
+  if owner.class == Hash
+    return owner[name]
+  elsif owner.class == Array
+    return owner[name.to_i]
   end
-  return result
+  return owner.method(name)
 end
 
 
 def set_property(owner, name, value)
-  # TODO: review
-  if owner.is_a?(Hash)
+  if owner.class == Hash
     owner[name] = value
     return
+  elsif owner.class == Array
+    owner[name.to_i] = value
+    return
   end
   return owner.const_set(name, value)
 end

data/packspec.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "packspec"
-  spec.version       = "0.1.4"
+  spec.version       = "0.1.5"
   spec.authors       = ["Evgeny Karev\n"]
   spec.email         = ["eskarev@gmail.com"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packspec
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - |
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler