sassconf 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 680e1904ad775caa81e4c706e348487c17eb519e
-  data.tar.gz: a581a9c6c1dc47fc20144c940ba6f0e73e9e31c5
+  metadata.gz: 55c75af5543053a7b3af4c7e645b4a1a14df089e
+  data.tar.gz: 1bb53359e87bb07c2157b2e947fd0cb317753e2a
 SHA512:
-  metadata.gz: 4efdada8a4926789346e1712e8037889bc8e92c3d8df9d3e042e071bd42475a2cf8502984b27cbaba4188775b1608080c023a7ee8cab829826cbdff6c8a46b52
-  data.tar.gz: a453267953ca8b2d46672e5df40d21d2f5f3e4b4b2bbc3309ea315b880325da6c9138502d79a98f950f77f67a23a1a09e789787a6d39eebd8eb2174cde43a235
+  metadata.gz: c652465dbbd47a37a5642532e2a06461baee18d92b15c96eb19f86be76d86ccd6d7dd831f6439068fcab1d21b222887541065624b0a08b1d056f55a70dc5be27
+  data.tar.gz: cd261ab416fe18b6c040a4f85987e05f9b6da33aba30e97dbb49dceebc19c4f5fc30bab76329a4b1e2119df5c7ac673c59ba4df3023833966448bb310f2ea995

data/README.md

@@ -8,6 +8,19 @@ With the Sassconf command tool you can use a config file for defining your [Sass
 If you liked the config file in any Compass environment then you'll like that one also because it's very similar :)
 
 ## ChangeLog
+#### Version 0.1.7 (0.1.6 was yanked)
+- Improved live reloading of config file.
+  - Works now in all exception cases.
+
+- Fixed OSX 'ps' command execution.
+
+- Added command check.
+
+- Improved process handling.
+  - Fixed 'no such process' exception.
+
+- Some minor fixes.
+
 #### Version 0.1.5
 - Fixed Exception handling.
 

data/bin/sassconf

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../lib/sassconf'
-Sassconf::start
+Sassconf.start

data/lib/sassconf.rb

@@ -15,8 +15,8 @@ module Sassconf
       DESCRIPTION = 'Description:'
                         .newline.blank(3) { 'Adds configuration file to Sass preprocessor.' }
                         .newline.blank(3) { "Version #{Sassconf::VERSION}" }
-                        .newline.blank(3) {'Homepage: http://sassconf.schlegel11.de'}
-                        .newline.blank(3) {'Email: develop@schlegel11.de'}
+                        .newline.blank(3) { 'Homepage: http://sassconf.schlegel11.de' }
+                        .newline.blank(3) { 'Email: develop@schlegel11.de' }
                         .paragraph
       REQUIRED = 'Required:'
       OPTIONAL = 'Optional:'.newline(1, :left)
@@ -70,32 +70,56 @@ module Sassconf
 
   def self.start
     begin
-      option_args = Parser.parse(ARGV)
-      config_manager = ConfigManager.new
-      executor = SassExecutor.new(ARGV[0], ARGV[1])
-
-      Sassconf.eval_and_execute(config_manager, executor, option_args)
-
-      config_manager.watch_update(option_args.config_path, option_args.reload_active) do |filename|
-        logger.info("Config reload: #{filename}")
-        Sassconf.eval_and_execute(config_manager, executor, option_args)
-        puts "Config reloaded: #{filename}".newline(1, :left).paragraph
-      end
-
-      executor.wait
+      cmd_check
+      @@option_args = Parser.parse(ARGV)
+      @@config_manager = ConfigManager.new
+      @@executor = SassExecutor.new(ARGV[0], ARGV[1])
+
+      eval_and_execute
+      live_reload(@@option_args.reload_active)
+      @@executor.wait
     rescue StandardError, ScriptError => e
       puts e.message
       logger.error(e)
     ensure
+      @@executor.detach_and_kill if defined?(@@executor)
       exit
     end
   end
 
-  def self.eval_and_execute(config_manager, sass_executor, option_args)
-    sass_executor.detach_and_kill
-    config_manager.eval_rb_file(option_args.config_path, option_args.extern_args)
-    argument_string = sass_executor.create_all_argument_strings(config_manager.variable_with_value_hash, config_manager.variable_hash)
-    sass_executor.execute(argument_string)
+  def live_reload(activate)
+    Util.pre_check(activate.boolean?, 'Activate is no boolean type.')
+    if (activate)
+      @@config_manager.watch_update(@@option_args.config_path) do |filename|
+        begin
+          logger.info("Config reload: #{filename}")
+          eval_and_execute
+          puts "Config reloaded: #{filename}".newline(1, :left).paragraph
+        rescue StandardError, ScriptError => e
+          puts e.message
+          logger.error(e)
+          @@executor.detach_and_kill
+        end
+      end
+    end
+  end
+
+  def eval_and_execute
+    @@executor.detach_and_kill
+    @@config_manager.eval_rb_file(@@option_args.config_path, @@option_args.extern_args)
+    argument_string = @@executor.create_all_argument_strings(@@config_manager.variable_with_value_hash, @@config_manager.variable_hash)
+    @@executor.execute(argument_string)
+  end
+
+  def cmd_check
+    message = if Util.windows?
+                '"WMIC" command not found!' unless Util.commands_exist?('WMIC')
+              else
+                '"ps" and/or "pgrep" command not found!' unless Util.commands_exist?('ps', 'pgrep')
+              end
+
+    raise(StandardError, message.newline { 'Please make sure that your system supports the command.' }) if message.string?
   end
 
+  module_function :eval_and_execute, :cmd_check, :live_reload
 end

data/lib/sassconf/config_manager.rb

@@ -11,8 +11,8 @@ module Sassconf
     ARRAY_FROM_STRING_SEPARATOR = ','
 
     def eval_rb_file(file_path, extern_string_array = String.empty)
-      Util.pre_check((file_path.is_string? and file_path.is_not_nil_or_empty? and File.exist?(file_path)), "\"rb\" file path is no string, nil, empty or doesn't exist.")
-      Util.pre_check((extern_string_array.is_string? and !extern_string_array.nil?), 'Extern string array is no string or nil.')
+      Util.pre_check((file_path.string? and file_path.not_nil_or_empty? and File.exist?(file_path)), "\"rb\" file path is no string, nil, empty or doesn't exist.")
+      Util.pre_check(extern_string_array.string?, 'Extern string array is no string.')
 
       @bind_extern_string_array = extern_string_array
       inject_array = 'extern_args = create_array_from_string(@bind_extern_string_array);'
@@ -23,14 +23,11 @@ module Sassconf
       eval("#{inject_array} \n #{source_file} \n #{collect_variables}", reader_binding, file_path, __LINE__ - eval_line)
     end
 
-    def watch_update(file_path, activate)
-      Util.pre_check(activate.is_boolean?, 'Activate is no boolean type.')
-      if (activate)
-        Util.pre_check((file_path.is_string? and file_path.is_not_nil_or_empty? and File.exist?(file_path)), "\"rb\" file path is no string, nil, empty or doesn't exist.")
-        FileWatcher.new([file_path]).watch do |filename, event|
-          if (event == :changed)
-            yield(filename)
-          end
+    def watch_update(file_path)
+      Util.pre_check((file_path.string? and file_path.not_nil_or_empty? and File.exist?(file_path)), "\"rb\" file path is no string, nil, empty or doesn't exist.")
+      FileWatcher.new([file_path]).watch do |filename, event|
+        if (event == :changed)
+          yield(filename)
         end
       end
     end

data/lib/sassconf/core_extensions.rb

@@ -3,29 +3,28 @@ require_relative 'util'
 module Sassconf
   module CoreExtensions
     module Object
-      def is_string?
-        false
-      end
-
-      def is_hash?
-        false
+      def self.def_false(*args)
+        raise ArgumentError, 'Argument is not a symbol' unless args.all? { |arg| arg.is_a?(Symbol) }
+        args.each { |arg| alias_method arg, :false_ }
       end
 
-      def is_boolean?
+      def false_()
         false
       end
     end
 
+    Object.def_false(:string?, :hash?, :boolean?, :integer?, :array?, :not_nil_or_empty?)
+
     module String
       def self.included(base)
         base.extend(ClassMethods)
       end
 
-      def is_string?
+      def string?
         true
       end
 
-      def is_not_nil_or_empty?
+      def not_nil_or_empty?
         !(self.nil? || self.empty?)
       end
 
@@ -53,17 +52,22 @@ module Sassconf
       end
 
       module_function :base_manipulation
-
     end
 
     module Hash
-      def is_hash?
+      def hash?
+        true
+      end
+    end
+
+    module Array
+      def array?
         true
       end
     end
 
     module Boolean
-      def is_boolean?
+      def boolean?
         true
       end
     end
@@ -82,10 +86,14 @@ class Hash
   include Sassconf::CoreExtensions::Hash
 end
 
+class Array
+  include Sassconf::CoreExtensions::Array
+end
+
 class TrueClass
-  include  Sassconf::CoreExtensions::Boolean
+  include Sassconf::CoreExtensions::Boolean
 end
 
 class FalseClass
-  include  Sassconf::CoreExtensions::Boolean
+  include Sassconf::CoreExtensions::Boolean
 end

data/lib/sassconf/sass_executor.rb

@@ -29,44 +29,36 @@ module Sassconf
     end
 
     def execute(argument_string)
-      Util.pre_check((argument_string.is_string? and argument_string.is_not_nil_or_empty?), 'Argument string is no string, nil or empty.')
+      Util.pre_check((argument_string.string? and argument_string.not_nil_or_empty?), 'Argument string is no string, nil or empty.')
 
       @pid = spawn(SASS_PROCESS % [argument_string, @sass_input, @sass_output])
       logger.info("Spawn Sass process: #{@pid}")
     end
 
     def detach_and_kill
-      unless @pid.nil?
+      if @pid.integer? && Util.process_exists?(@pid)
         logger.info("Detach Sass process: #{@pid}")
         Process.detach(@pid)
-        out, status = if Util.windows? then
-                        logger.info("Find child processes on MS-DOS")
-                        Open3.capture2("wmic process where (ParentProcessId=#{@pid.to_s}) get ProcessId")
-                      else
-                        logger.info("Find child processes on UNIX")
-                        Open3.capture2('ps', 'h', '--ppid', @pid.to_s, '-o', 'pid')
-                      end
+
         logger.info("Kill process: #{@pid}")
         Process.kill('KILL', @pid)
-        out.each_line do |elem|
-          pid = elem.to_i;
-          unless pid == 0
-            Process.kill('KILL', pid)
-            logger.info("Killed child process: #{pid}")
-          end
+
+        Util.process_childs(@pid) do |pid|
+          Process.kill('KILL', pid)
+          logger.info("Killed child process: #{pid}")
         end
       end
     end
 
     def wait
       logger.info("Wait for Sass process: #{@pid}")
-      Process.wait(@pid) unless @pid.nil?
+      Process.wait(@pid) if @pid.integer? && Util.process_exists?(@pid)
     end
 
     private
     def create_string(argument_type, argument_hash)
-      Util.pre_check(argument_type.is_string?, 'Argument type is no string.')
-      Util.pre_check((argument_hash.is_hash? and !argument_hash.nil?), 'Argument hash is no hash or nil.')
+      Util.pre_check(argument_type.string?, 'Argument type is no string.')
+      Util.pre_check(argument_hash.hash?, 'Argument hash is no hash.')
 
       logger.info("Create argument string from hash: #{argument_hash}")
       argument_hash.each { |key, value| argument_hash[key] = String.empty if value == :no_value }
@@ -74,3 +66,4 @@ module Sassconf
     end
   end
 end
+

data/lib/sassconf/util.rb

@@ -1,19 +1,103 @@
+require_relative 'core_extensions'
+
 module Sassconf
+  module MsDos
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def process_childs(ppid, &block)
+        Util.pre_check((ppid.integer? and ppid > 0), 'Ppid is no integer.')
+        CrossSystem.process_childs("wmic process where (ParentProcessId=#{ppid.to_s}) get ProcessId", &block)
+      end
+
+      def process_exists?(pid)
+        Util.pre_check((pid.integer? and pid > 0), 'Pid is no integer.')
+        CrossSystem.process_exists?("wmic process where (ProcessId=#{pid.to_s}) get ProcessId")
+      end
+    end
+  end
+
+  module Unix
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def process_childs(ppid, &block)
+        Util.pre_check((ppid.integer? and ppid > 0), 'Ppid is no integer.')
+        CrossSystem.process_childs('pgrep', '-P', ppid.to_s, &block)
+      end
+
+      def process_exists?(pid)
+        Util.pre_check((pid.integer? and pid > 0), 'Pid is no integer.')
+        CrossSystem.process_exists?('ps', '-o', 'pid=', pid.to_s)
+      end
+    end
+  end
+
+  module CrossSystem
+    module_function
+
+    def process_childs(*cmds)
+      Util.pre_check((cmds.any? and cmds.all? { |elem| elem.string? }), 'cmds is empty or element is no string.')
+
+      out, status = Open3.capture2(*cmds)
+      out.each_line do |elem|
+        pid = elem.to_i;
+        unless pid == 0 && block_given?
+          yield(pid)
+        end
+      end
+    end
+
+    def process_exists?(*cmds)
+      Util.pre_check((cmds.any? and cmds.all? { |elem| elem.string? }), 'cmds is empty or element is no string.')
+
+      out, status = Open3.capture2(*cmds)
+      out.each_line.select { |elem| elem.to_i != 0 }.any?
+    end
+  end
+
   class Util
-    def self.pre_check(term, message)
-      raise ArgumentError, message unless term
+    def self.init
+      windows? ? include(Sassconf::MsDos) : include(Sassconf::Unix)
+    end
+
+    private_class_method :new, :init
+
+    def self.pre_check(term, message = String.empty)
+      raise(ArgumentError, message) unless term
+    end
+
+    def self.which(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each { |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        }
+      end
+      nil
+    end
+
+    def self.commands_exist?(*cmds)
+      cmds.all? { |cmd| which(cmd).not_nil_or_empty? }
     end
 
     #Credits go to https://github.com/rdp/os
     def self.windows?
-        if RUBY_PLATFORM =~ /cygwin/ # i386-cygwin
-          false
-        elsif ENV['OS'] == 'Windows_NT'
-          true
-        else
-          false
-        end
+      if RUBY_PLATFORM =~ /cygwin/ # i386-cygwin
+        false
+      elsif ENV['OS'] == 'Windows_NT'
+        true
+      else
+        false
       end
+    end
+
+    init
   end
 end
 

data/lib/sassconf/version.rb

@@ -1,3 +1,3 @@
 module Sassconf
-  VERSION = '0.1.5'
+  VERSION = '0.1.7'
 end

data/test/test_config_reader.rb

@@ -40,10 +40,10 @@ class TestConfigReader < Minitest::Test
     assert_equal("\"rb\" file path is no string, nil, empty or doesn't exist.", exception.message)
 
     exception = assert_raises(ArgumentError) { @config_manager.eval_rb_file(CONFIG_PATH, 0) }
-    assert_equal('Extern string array is no string or nil.', exception.message)
+    assert_equal('Extern string array is no string.', exception.message)
 
     exception = assert_raises(ArgumentError) { @config_manager.eval_rb_file(CONFIG_PATH, nil) }
-    assert_equal('Extern string array is no string or nil.', exception.message)
+    assert_equal('Extern string array is no string.', exception.message)
 
     assert_equal(nil, @config_manager.variable_with_value_hash)
     assert_equal(nil, @config_manager.variable_hash)
@@ -53,7 +53,11 @@ class TestConfigReader < Minitest::Test
   end
 
   def test_negative_watch_update
-    exception = assert_raises(ArgumentError) { @config_manager.watch_update(nil, 0) }
-    assert_equal('Activate is no boolean type.', exception.message)
+    exception = assert_raises(ArgumentError) { @config_manager.watch_update(nil) }
+    assert_equal("\"rb\" file path is no string, nil, empty or doesn't exist.", exception.message)
+    exception = assert_raises(ArgumentError) { @config_manager.watch_update(String.empty) }
+    assert_equal("\"rb\" file path is no string, nil, empty or doesn't exist.", exception.message)
+    exception = assert_raises(ArgumentError) { @config_manager.watch_update('/no/path') }
+    assert_equal("\"rb\" file path is no string, nil, empty or doesn't exist.", exception.message)
   end
 end

data/test/test_sass_executor.rb

@@ -22,10 +22,10 @@ class TestSassExecuter < Minitest::Test
 
   def test_negative_create_argument_with_value_string
     exception = assert_raises(ArgumentError) { @sass_executor.create_argument_with_value_string(String.empty) }
-    assert_equal('Argument hash is no hash or nil.', exception.message)
+    assert_equal('Argument hash is no hash.', exception.message)
 
     exception = assert_raises(ArgumentError) { @sass_executor.create_argument_with_value_string(nil) }
-    assert_equal('Argument hash is no hash or nil.', exception.message)
+    assert_equal('Argument hash is no hash.', exception.message)
   end
 
   def test_positive_create_argument_string
@@ -36,10 +36,10 @@ class TestSassExecuter < Minitest::Test
 
   def test_negative_create_argument_string
     exception = assert_raises(ArgumentError) { @sass_executor.create_argument_string(String.empty) }
-    assert_equal('Argument hash is no hash or nil.', exception.message)
+    assert_equal('Argument hash is no hash.', exception.message)
 
     exception = assert_raises(ArgumentError) { @sass_executor.create_argument_string(nil) }
-    assert_equal('Argument hash is no hash or nil.', exception.message)
+    assert_equal('Argument hash is no hash.', exception.message)
   end
 
   def test_positive_create_all_argument_strings
@@ -50,16 +50,16 @@ class TestSassExecuter < Minitest::Test
 
   def test_negative_create_all_argument_strings
     exception = assert_raises(ArgumentError) { @sass_executor.create_all_argument_strings(@config_manager.variable_with_value_hash, String.empty) }
-    assert_equal('Argument hash is no hash or nil.', exception.message)
+    assert_equal('Argument hash is no hash.', exception.message)
 
     exception = assert_raises(ArgumentError) { @sass_executor.create_all_argument_strings(@config_manager.variable_with_value_hash, nil) }
-    assert_equal('Argument hash is no hash or nil.', exception.message)
+    assert_equal('Argument hash is no hash.', exception.message)
 
     exception = assert_raises(ArgumentError) { @sass_executor.create_all_argument_strings(String.empty, @config_manager.variable_hash) }
-    assert_equal('Argument hash is no hash or nil.', exception.message)
+    assert_equal('Argument hash is no hash.', exception.message)
 
     exception = assert_raises(ArgumentError) { @sass_executor.create_all_argument_strings(nil, @config_manager.variable_hash) }
-    assert_equal('Argument hash is no hash or nil.', exception.message)
+    assert_equal('Argument hash is no hash.', exception.message)
   end
 
   def test_positive_execute

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassconf
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Marcel Schlegel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Adds configuration file to Sass converter.