xing-root 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 224214a3348a5a289b7b64913d28f8a12e77d7c4
-  data.tar.gz: f632c404e5314285cb9814425b06980ff644dabf
+  metadata.gz: 3b7cc39602a768835c8e5cf4dc7cda6884eb6670
+  data.tar.gz: 6738e678f71aa65d087f3e6ed8b0e62dd3c2c7c5
 SHA512:
-  metadata.gz: b0c21dbafff125764618ff9edf2ed9f6b0fb9056b305658745b4b1fa95b873b6d0218f6a9a4a764ff261a27f0350d3614dfb62af24686bb49e4fb968f141f7a7
-  data.tar.gz: d0744229a4f6272591e1fed511933cd71463657676a7eb832f0c43222a94a244203b7175fea26b12393da504521104fc60ea56b182f7d23d90f667201ff693df
+  metadata.gz: 5d1d4f6ccc0eab2ba8bec3a827b10a8e504b9bd627035757087728106398c37252a3137ba264049d84a6d6b4fe9d55995c72709646efe66ae5f76d370237c267
+  data.tar.gz: 2fb02b3b6dc705b41069ff86e316b4df0bbab05e22729ee41f1da8649cd8a50de331305177de97aefdff2ccaf0923232d131adbafd09a01b6b61574de35f1624

data/lib/xing/edicts/structure-checker.rb

@@ -51,7 +51,8 @@ module Xing::Edicts
           problems.each{|prob| out_stream.puts "  " + prob.to_s}
           out_stream.puts
         end
-        raise Error, "Problems found in ECMAScript structure"
+        out_stream.puts "Problems found in ECMAScript structure"
+        #raise Error, "Problems found in ECMAScript structure"
       end
     end
 

data/lib/xing/utils/import_checker.rb

@@ -13,7 +13,7 @@ module Xing::Utils
     end
 
     def is_import_line
-      /\s*import/.match(@import_line)
+      /^\s*import/.match(@import_line)
     end
 
     def skip_to_end_of_import
@@ -34,7 +34,12 @@ module Xing::Utils
     end
 
     def check_empty_match
-      problem "doesn't seem to have a 'from' clause..." if @md.nil?
+      if @md.nil?
+        problem "doesn't seem to have a 'from' clause..."
+        true
+      else
+        false
+      end
     end
 
     def check_structure
@@ -60,16 +65,18 @@ module Xing::Utils
     end
 
     def check(&error_block)
-      initialize_check(error_block)
-      while @lineno < @lines.length
-        read_next
-        if is_import_line
-          skip_to_end_of_import
-          match_line
-          check_empty_match
-          check_structure
+      begin
+        initialize_check(error_block)
+        while @lineno < @lines.length
+          read_next
+          if is_import_line
+            skip_to_end_of_import
+            match_line
+            check_structure if !check_empty_match
+          end
+          @lineno += 1
         end
-        @lineno += 1
+      rescue
       end
     end
   end

data/spec/edicts/structure_checker_spec.rb

@@ -22,7 +22,9 @@ describe Xing::Edicts::StructureChecker do
     end
 
     it "should report errors" do
-      expect{subject.action}.to raise_error(Xing::Edicts::StructureChecker::Error)
+      subject.action
+      #expect{subject.action}.to raise_error(Xing::Edicts::StructureChecker::Error)
+      expect(stdout.string).to match("Problems found in ECMAScript structure")
       expect(stdout.string).to match(%r{In test-dir/problem.js})
       expect(stdout.string).to match(%r{'from' includes ../})
     end
@@ -35,6 +37,7 @@ describe Xing::Edicts::StructureChecker do
 
     it "should not report errors" do
       expect{subject.action}.not_to raise_error
+      expect(stdout.string).to be_empty
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xing-root
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Judson Lester
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edict
@@ -99,7 +99,7 @@ rdoc_options:
 - "--main"
 - doc/README
 - "--title"
-- xing-root-0.0.6 Documentation
+- xing-root-0.0.7 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: xing-root
-rubygems_version: 2.4.8
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: The Root of all Xing