packspec 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0531ed015b0fcc81e3aa62bac12011f33b69ce9b
-  data.tar.gz: cc8de8f4ac4d27cc08b2fa006bce54a6400c918d
+  metadata.gz: 9a04e0536fc0d222d75d7644e31fe6e313245a46
+  data.tar.gz: 6e51a159a6a8e96b5a49bf91d175422b4c47e54d
 SHA512:
-  metadata.gz: e924e041feab6d6b9c1befc1db57246e3597509eebbf8ee09fe3af06a77c461ad2cf05ef8d605a50b7a076e5339cd47f0bc45288ff01129fb1c3c82540bbdc9f
-  data.tar.gz: a41c8cfd6b471370cba5fe506898ddfdc3fb98c9d8d25243b559be03e023d3fcc8fa6af871d2e647e2d1b6e430b8757ff57fb7f22741a60b47d9f2644493f441
+  metadata.gz: 7186eedf6caa1337a6608f9d8d53c8f335814d7058562d7d0d5cd57fd72921386a947ad72ab745397b1cb2e46336a755a1e2fb0f1d3ee2fdef1aa6306cb9b3f0
+  data.tar.gz: cf96960d06e597534089e744ea606715c1614d51004ea5c7f28f9976c29bdc83cc6cf79e01019474985b52f0f061391189550c15425e3ff937b3de55197f5c51

data/lib/cli.rb

@@ -1,70 +1,36 @@
-require 'pp'
 require 'json'
 require 'yaml'
 require 'emoji'
 require 'colorize'
-require 'test/unit'
-extend Test::Unit::Assertions
 
 
 # Helpers
 
 def parse_specs(path)
 
-  # Specs
-  specmap = {}
-  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'])
+  # Paths
+  paths = []
+  if !path
+    paths =  Dir.glob('package.*')
+    if paths.empty?
+      path = 'packspec'
     end
   end
-
-  # Hooks
-  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
+  if File.file?(path)
+    paths = [path]
+  elsif File.directory?(path)
+    for path in Dir.glob("#{path}/*.*")
+      paths.push(path)
     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
+  # Specs
+  specs = []
+  for path in paths
+    spec = parse_spec(path)
+    if spec
+      specs.push(spec)
     end
-    spec['scope'].merge!(hookmap)
   end
 
   return specs
@@ -72,64 +38,68 @@ def parse_specs(path)
 end
 
 
-def parse_spec(spec)
+def parse_spec(path)
+
+  # Documents
+  documents = []
+  if !path.end_with?('.yml')
+    return nil
+  end
+  contents = File.read(path)
+  YAML.load_stream(contents) do |document|
+    documents.push(document)
+  end
 
   # Package
-  contents = YAML.load(spec)
-  begin
-    feature = parse_feature(contents[0])
-    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
+  feature = parse_feature(documents[0][0])
+  if feature['skip']
     return nil
   end
+  package = feature['comment']
 
   # Features
+  skip = false
   features = []
-  for feature in contents
+  for feature in documents[0]
     feature = parse_feature(feature)
     features.push(feature)
+    if feature['comment']
+      skip = feature['skip']
+    end
+    feature['skip'] = skip || feature['skip']
   end
 
   # Scope
   scope = {}
-  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]
+  scope['$import'] = BuiltinFunctions.new().public_method(:builtin_import)
+  if documents.length > 1 && documents[1]['rb']
+    eval(documents[1]['rb'])
+    hook_scope = Functions.new()
+    for name in hook_scope.public_methods
+      # TODO: filter ruby builtin methods
+      scope["$#{name}"] = hook_scope.public_method(name)
     end
-    for module_name in module_names
-      attributes = get_module_attributes(module_name)
-      namespace_scope.merge!(attributes)
-      if !attributes.empty?
-        break
+  end
+
+  # Stats
+  stats = {'features' => 0, 'comments' => 0, 'skipped' => 0, 'tests' => 0}
+  for feature in features
+    stats['features'] += 1
+    if feature['comment']
+      stats['comments'] += 1
+    else
+      stats['tests'] += 1
+      if feature['skip']
+        stats['skipped'] += 1
       end
     end
-    if attributes.empty?
-      scope = {}
-      break
-    end
   end
-  package = packages.sort().join('/')
 
   return {
     'package' => package,
     'features' => features,
     'scope' => scope,
+    'stats' => stats,
   }
 
 end
@@ -139,11 +109,10 @@ def parse_feature(feature)
 
   # General
   if feature.is_a?(String)
-    match = /^(?:(.*):)?(\w.*)$/.match(feature)
+    match = /^(?:\((.*)\))?(\w.*)$/.match(feature)
     skip, comment = match[1], match[2]
     if !!skip
-      filters = skip.split(':')
-      skip = (filters[0] == 'not') == (filters.include?('rb'))
+      skip = !skip.split(':').include?('rb')
     end
     return {'assign' => nil, 'comment' => comment, 'skip' => skip}
   end
@@ -151,11 +120,10 @@ def parse_feature(feature)
 
   # Left side
   call = false
-  match = /^(?:(.*):)?(?:([^=]*)=)?([^=].*)?$/.match(left)
+  match = /^(?:\((.*)\))?(?:([^=]*)=)?([^=].*)?$/.match(left)
   skip, assign, property = match[1], match[2], match[3]
   if !!skip
-    filters = skip.split(':')
-    skip = (filters[0] == 'not') == (filters.include?('rb'))
+    skip = !skip.split(':').include?('rb')
   end
   if !assign && !property
     raise Exception.new('Non-valid feature')
@@ -226,21 +194,31 @@ end
 
 
 def test_specs(specs)
-  success = true
+
+  # Message
   message = "\n #  Ruby\n".bold
   puts(message)
+
+  # Test specs
+  success = true
   for spec in specs
     spec_success = test_spec(spec)
     success = success && spec_success
   end
+
   return success
+
 end
 
 
 def test_spec(spec)
-  passed = 0
+
+  # Message
   message = Emoji.find_by_alias('heavy_minus_sign').raw * 3 + "\n\n"
   puts(message)
+
+  # Test spec
+  passed = 0
   for feature in spec['features']
     result = test_feature(feature, spec['scope'])
     if result
@@ -248,6 +226,8 @@ def test_spec(spec)
     end
   end
   success = (passed == spec['stats']['features'])
+
+  # Message
   color = 'green'
   message = ("\n " + Emoji.find_by_alias('heavy_check_mark').raw + '  ').green.bold
   if !success
@@ -256,7 +236,9 @@ def test_spec(spec)
   end
   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
 
 
@@ -358,26 +340,24 @@ def test_feature(feature, scope)
 end
 
 
-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)
+class BuiltinFunctions
+  def builtin_import(package)
+    attributes = {}
+    require(package)
+    for item in ObjectSpace.each_object
+      if package == String(item).downcase
+        begin
+          scope = Kernel.const_get(item)
+        rescue Exception
+          next
+        end
+        for name in scope.constants
+          attributes[String(name)] = scope.const_get(name)
+        end
       end
     end
+    return attributes
   end
-  return attributes
 end
 
 
@@ -428,7 +408,7 @@ end
 
 # Main program
 
-path = ARGV[0] || '.'
+path = ARGV[0] || nil
 specs = parse_specs(path)
 success = test_specs(specs)
 if !success

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.5"
+  spec.version       = "0.1.6"
   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.5
+  version: 0.1.6
 platform: ruby
 authors:
 - |
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler