xing-root 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c64efb83d9d7271086747e451a58babb63ce3a7
-  data.tar.gz: dc71959f796fef4829ec9c177e5ded7092371880
+  metadata.gz: ec46b808ae2a32a6d8349f4eced8e10202f6f64b
+  data.tar.gz: 30e0847a924137bbd017b09226b4456b49354b87
 SHA512:
-  metadata.gz: 9b1d29f31ef9f6e614b37776dc134128320d64cfe3f5bab9aa8a95773949ea857d5c98f15bb009c33842a4c750025e4f2251ee93da62596374321fe910afd542
-  data.tar.gz: 830ff5f7c27700c94e62046c64308e1ffd16a395be1aed03068b045f0ebbd7c562034dbc781a5115b6b49ac03f8e74d111c721deb6e916d1e576069cdda15671
+  metadata.gz: 656cc7df65075d545847d99b134a66384122f3e000c1843a80a90a45d5acecb30eb70eb5939755a0863beef62b6eafc0b200446f73414a500692942e3bf57c20
+  data.tar.gz: 361b16409ea0c7ad4b7aaa40a8d65f7ae79fec931cdae2c939b444fcea5f8d4e7ecef78864610b972a2b9b30a607ea6a72eaae39e1a61c054b4da7d04e25df96

data/lib/xing/edicts/launch-browser.rb

@@ -63,7 +63,7 @@ module Xing::Edicts
         raise "Can't find any executable to launch a browser with."
       end
 
-      run_command( cmd(browser_command, "http://localhost:#{static_server_port}/") ).must_succeed!
+      run_command(cmd(browser_command, "http://localhost:#{static_server_port}/")).must_succeed!
     end
 
     def subprocess_action

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

@@ -1,6 +1,7 @@
 require 'xing-root'
 require 'find'
 require 'edict'
+require 'xing/utils/import_checker'
 
 module Xing::Edicts
   class StructureChecker < Edict::Rule
@@ -74,25 +75,9 @@ module Xing::Edicts
     end
 
     def check_imports(path, context)
-      File.read(path).lines.grep(/\s*import/).each_with_index do |import_line, lineno|
-        md = /.*from (?<quote>['"])(?<from>.*)\k<quote>/.match(import_line)
-        if md.nil?
-          problem "doesn't seem to have a 'from' clause...", import_line, lineno, path
-        end
-
-        if /\.\./ =~ md[:from]
-          if /\A\.\./ !~ md[:from]
-            problem "from includes .. not at pos 0", import_line, lineno, path
-          end
-          if /\w.*\.\./ =~ md[:from]
-            problem "from includes .. after words", import_line, lineno, path
-          end
-          if !(violation = %r{(?<dir>\w+)/\w}.match md[:from]).nil?
-            unless %r{\.\./(#{context.escape_clause_list.join("|")})} =~ md[:from]
-              problem "Imports Rule: 'from' includes ../ and then #{violation[:dir].inspect} not in #{context.escape_clause_list.inspect}", import_line, lineno, path
-            end
-          end
-        end
+      checker = Xing::Utils::ImportChecker.new(path, context)
+      checker.check do |message, line, lineno|
+        problem message, line, lineno, path
       end
     end
   end

data/lib/xing/managers/child.rb

@@ -41,17 +41,6 @@ class ChildManager
     return false
   end
 
-  def wait_until_dead(pilimit)
-    start = Time.now
-    while Time.now - start < limit
-      Process.waitpid(-1, Process::WNOHANG | Process::WUNTRACED)
-      sleep(0.1)
-    end
-    return false
-  rescue SystemCallError # = no children
-    return true
-  end
-
   def wait_all
     Process.waitall
   end

data/lib/xing/managers/tmux.rb

@@ -62,7 +62,7 @@ module Xing
 
       def wait_all
         path = File.expand_path(@extra_config_path)
-        if File.exists?(path)
+        if File.exist?(path)
           puts "Loading #{path}"
           tmux "source-file #{path}"
         else
@@ -145,7 +145,7 @@ module Xing
         end
       end
 
-      def open_additional_window(name, task)
+      def open_additional_window(_name, task)
         tmux "select-layout -t '#@window_name' #{layout}"
         @window_count = @window_count + 1
         @window_name = "Dev Servers #{@window_count}"

data/lib/xing/tasks/develop.rb

@@ -19,33 +19,36 @@ module Xing
       setting :manager
       setting :config_dir, "../frontend"
 
-      def default_configuration
-        @port_offset ||=
-          begin
-            if !ENV['PORT_OFFSET'].nil?
-              ENV['PORT_OFFSET'].to_i.tap do |offset|
-                puts "Shifting server ports by #{offset}"
-              end
-            else
-              0
-            end
+      def get_port_offset
+        if !ENV['PORT_OFFSET'].nil?
+          ENV['PORT_OFFSET'].to_i.tap do |offset|
+            puts "Shifting server ports by #{offset}"
           end
+        else
+          0
+        end
+      end
 
-        @manager ||=
-          begin
-            require 'xing/managers/child'
-            require 'xing/managers/tmux'
-            if Managers::Tmux.available?
-              Managers::TmuxPane.new
-            else
-              ChildManager.new.tap do |mngr|
-                at_exit{ mngr.kill_all }
-              end
+      def choose_output_manager
+        begin
+          require 'xing/managers/child'
+          require 'xing/managers/tmux'
+          if Managers::Tmux.available?
+            Managers::TmuxPane.new
+          else
+            ChildManager.new.tap do |mngr|
+              at_exit{ mngr.kill_all }
             end
-          end.tap do |mgr|
-            puts "Using #{mgr.class.name}"
           end
-          super
+        end.tap do |mgr|
+          puts "Using #{mgr.class.name}"
+        end
+      end
+
+      def default_configuration
+        @port_offset ||= get_port_offset
+        @manager ||= choose_output_manager
+        super
       end
 
       def resolve_configuration

data/lib/xing/tasks/spec.rb

@@ -34,7 +34,7 @@ module Xing
             eddie.dir = "backend"
             eddie.shell_cmd = %w{bundle exec rspec}
           end
-          task :full, [:spec_files] => [:check_dependencies, 'frontend:code_structure', :grunt_ci_test, 'backend:setup', :prepare_db] do |t, args|
+          task :full, [:spec_files] => [:check_dependencies, 'frontend:code_structure', :grunt_ci_test, 'backend:setup', :prepare_db] do |_task, args|
             if args[:spec_files]
               full_spec_edict.shell_cmd.push(args[:spec_files])
             end
@@ -46,7 +46,7 @@ module Xing
             copy_settings_to(eddie)
             eddie.dir = "backend"
           end
-          task :responsivity, [:spec_files] => ['backend:setup', :prepare_db] do |t, args|
+          task :responsivity, [:spec_files] => ['backend:setup', :prepare_db] do |_task, args|
             %w{mobile small medium desktop}.each do |size|
               responsivity_edict.shell_cmd = ["bundle", "exec", "rspec", "-o", "tmp/rspec_#{size}.txt"]
               responsivity_edict.env_hash = {'BROWSER_SIZE' => size}
@@ -64,7 +64,7 @@ module Xing
             eddie.dir = "backend"
             eddie.shell_cmd = %w{bundle exec rspec}
           end
-          task :fast, [:spec_files] => ['backend:setup', :prepare_db] do |t, args|
+          task :fast, [:spec_files] => ['backend:setup', :prepare_db] do |_task, args|
             if args[:spec_files]
               fast_edict.shell_cmd.push(args[:spec_files])
             else

data/lib/xing/tasks/tasklib.rb

@@ -3,7 +3,7 @@ require 'mattock'
 module Xing
   module Tasks
     class Tasklib < Mattock::Tasklib
-      def edict_task(name, klass, &block)
+      def edict_task(name, klass, &_block)
         edict = klass.new do |eddie|
           copy_settings_to(eddie)
           yield eddie if block_given?

data/lib/xing/tasks.rb

@@ -1,6 +1,3 @@
-#require 'pp'
-#pp $:
-
 require 'xing/tasks/backend'
 require 'xing/tasks/build'
 require 'xing/tasks/develop'

data/lib/xing/utils/import_checker.rb

@@ -0,0 +1,76 @@
+module Xing::Utils
+  class ImportChecker
+
+    def initialize(path, context)
+      @path = path
+      @context = context
+    end
+
+    attr_reader :path, :context
+
+    def read_next
+      @import_line = @lines[@lineno]
+    end
+
+    def is_import_line
+      /\s*import/.match(@import_line)
+    end
+
+    def skip_to_end_of_import
+      # for a multi-line import, we need to skip past multiple lines of import
+      begin_check = /.*(?<begin>\{).*/.match(@import_line)
+      end_check = /.*(?<end>\}).*/.match(@import_line)
+      if begin_check and !end_check
+        until end_check
+          @lineno += 1
+          read_next
+          end_check = /.*(?<end>\}).*/.match(@import_line)
+        end
+      end
+    end
+
+    def match_line
+      @md = /.*from (?<quote>['"])(?<from>.*)\k<quote>/.match(@import_line)
+    end
+
+    def check_empty_match
+      problem "doesn't seem to have a 'from' clause..." if @md.nil?
+    end
+
+    def check_structure
+      if /\.\./ =~ @md[:from]
+        problem "from includes .. not at pos 0" if /\A\.\./ !~ @md[:from]
+        problem "from includes .. after words" if /\w.*\.\./ =~ @md[:from]
+        unless (violation = %r{(?<dir>\w+)/\w}.match @md[:from]).nil?
+          unless %r{\.\./(#{context.escape_clause_list.join("|")})} =~ @md[:from]
+            problem "Imports Rule: 'from' includes ../ and then #{violation[:dir].inspect} not in #{context.escape_clause_list.inspect}"
+          end
+        end
+      end
+    end
+
+    def problem(message)
+      @error_block.call(message, @import_line, @lineno)
+    end
+
+    def initialize_check(error_block)
+      @error_block = error_block
+      @lines = File.read(path).lines
+      @lineno = 0
+    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
+        end
+        @lineno += 1
+      end
+    end
+  end
+end

data/spec/utils/import_checker_spec.rb

@@ -0,0 +1,120 @@
+require 'xing/utils/import_checker'
+require 'support/file-sandbox'
+require 'stringio'
+
+describe Xing::Utils::ImportChecker do
+  include FileSandbox
+
+  let :stdout do
+    StringIO.new
+  end
+
+  let :errors do
+    []
+  end
+
+  let :context do
+    double("context", :escape_clause_list => ['common', 'framework'])
+  end
+
+  subject :checker do
+    Xing::Utils::ImportChecker.new("test-dir/problem.js", context)
+  end
+
+  describe "with a problem file" do
+
+    before :each do
+      @sandbox.new :file => "test-dir/problem.js", :with_content => "import Thing from '../../../somewhere/bad.js';"
+      checker.check do |message, import_line, lineno|
+        errors << [message, import_line, lineno]
+      end
+    end
+
+    it "should report errors" do
+      expect(errors).to_not be_empty
+      expect(errors[0][0]).to match(%r{'from' includes ../})
+    end
+  end
+
+  describe "with a good file" do
+    before :each do
+      @sandbox.new :file => "test-dir/problem.js", :with_content => "import Thing from 'somewhere/okay.js';"
+      checker.check do |message, import_line, lineno|
+        errors << [message, import_line, lineno]
+      end
+    end
+
+    it "should not report errors" do
+      expect(errors).to be_empty
+    end
+  end
+
+  describe "single line with brackets" do
+    describe "with a problem file" do
+
+      before :each do
+        @sandbox.new :file => "test-dir/problem.js", :with_content => "import { Thing } from '../../../somewhere/bad.js';"
+        checker.check do |message, import_line, lineno|
+          errors << [message, import_line, lineno]
+        end
+      end
+
+      it "should report errors" do
+        expect(errors).to_not be_empty
+        expect(errors[0][0]).to match(%r{'from' includes ../})
+      end
+    end
+
+    describe "with a good file" do
+      before :each do
+        @sandbox.new :file => "test-dir/problem.js", :with_content => "import { Thing } from 'somewhere/okay.js';"
+        checker.check do |message, import_line, lineno|
+          errors << [message, import_line, lineno]
+        end
+      end
+
+      it "should not report errors" do
+        expect(errors).to be_empty
+      end
+    end
+  end
+
+  describe "multi-line import" do
+    describe "with a problem file" do
+      before :each do
+        @sandbox.new :file => "test-dir/problem.js", :with_content => <<-eos
+          import {
+            Thing,
+            OtherThing
+          } from '../../../somewhere/bad.js';"
+        eos
+        checker.check do |message, import_line, lineno|
+          errors << [message, import_line, lineno]
+        end
+      end
+
+      it "should report errors" do
+        expect(errors).to_not be_empty
+        expect(errors[0][0]).to match(%r{'from' includes ../})
+      end
+    end
+
+    describe "with a good file" do
+      before :each do
+        @sandbox.new :file => "test-dir/problem.js", :with_content => <<-eos
+          import {
+            Thing,
+            OtherThing
+          } from 'somewhere/okay.js';"
+        eos
+        checker.check do |message, import_line, lineno|
+          errors << [message, import_line, lineno]
+        end
+      end
+
+      it "should not report errors" do
+        expect(errors).to be_empty
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xing-root
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Judson Lester
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edict
@@ -78,15 +78,17 @@ files:
 - lib/xing/tasks/frontend.rb
 - lib/xing/tasks/spec.rb
 - lib/xing/tasks/tasklib.rb
+- lib/xing/utils/import_checker.rb
 - spec/edicts/clean_rake_spec.rb
 - spec/edicts/clean_run_spec.rb
 - spec/edicts/launch-browser_spec.rb
 - spec/edicts/start-child_spec.rb
+- spec/edicts/structure_checker_spec.rb
 - spec/managers/tmux_spec.rb
 - spec/support/file-sandbox.rb
 - spec/tasks/develop_spec.rb
 - spec/tasks/frontend_spec.rb
-- spec/tasks/structure_checker_spec.rb
+- spec/utils/import_checker_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -97,7 +99,7 @@ rdoc_options:
 - "--main"
 - doc/README
 - "--title"
-- xing-root-0.0.4 Documentation
+- xing-root-0.0.5 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement