balmora 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f7d56a33f3e8d7e5e35beeb227e3881023ad7ca
-  data.tar.gz: 0a4e21d622e6a0c78c0ad5956d0b07b15221525e
+  metadata.gz: 9cf8833c64f0f3895e288f09db093d2c365a577d
+  data.tar.gz: 405a2c51a8036a656e186d4414d187761a521b5b
 SHA512:
-  metadata.gz: 766373a8b25c96fc88762099c517f6bbd8c66d1f404c95c4ed8dbdfe2286da69664c1b694d513fd55de58536d090d810a7ae4cd5e2996085af7c366866a8a8d8
-  data.tar.gz: ec88c1d20741eda666acf3083a63293d2b1730915cf0f3674b80bd624d80cb30e90ad3809cdb13287186d7ffb5e56cf1f0771b3df9c377cf82143cd562cdfbac
+  metadata.gz: 5924a77e1e27a7fba1d0b997ca1f9ffaa3894351fa10fe74a31eec61c501e0e2de4d5b0790d71b2d15c286c245326b329ad8d2974598c8e52ce17b6ef08d3961
+  data.tar.gz: 1716e508647620798eb6b07bff6e1de6a4cc939b02329b5800782f7e1d33649ce2c76f30384ae722d9dd2314bbba4c69b3c64a7c01c8371b979fc4b2ca5d1d52

data/lib/balmora/arguments.rb

@@ -7,6 +7,7 @@ class Balmora::Arguments
 
     result = {}
     index = 0
+    tail = nil
     while index < argv.length
       arg = argv[index]
 
@@ -19,13 +20,20 @@ class Balmora::Arguments
       end
 
       if new_index.nil?()
-        return result, argv[index..-1]
+        tail = argv[index..-1]
+        break
       end
 
       index = new_index + 1
     end
 
-    return result, nil
+    options.each() { |key, value|
+      if value[:flag] && !result.has_key?(key)
+        result[key] = false
+      end
+    }
+
+    return result, tail
   end
 
   protected

data/lib/balmora/cli.rb

@@ -33,6 +33,12 @@ class Balmora::Cli
         description: 'Quite mode; reports only errors',
       },
 
+      dry: {
+        shortcut: 'd',
+        flag: true,
+        description: 'Dry run; will not run modify commands but report it to log',
+      },
+
       verbose: {
         shortcut: 'v',
         flag: true,

data/lib/balmora/command/exec.rb

@@ -18,7 +18,7 @@ class Balmora::Command::Exec < Balmora::Command
       exec = [@shell.expression(exec)]
     end
 
-    @shell.system(exec)
+    @shell.system(exec, change: true)
   end
 
 end

data/lib/balmora/command/file.rb

@@ -2,7 +2,23 @@ class Balmora::Command::File < Balmora::Command
 
   class Error < StandardError; end
 
-  OPTIONS = '-T'
+  def self.resolve_path(shell, source, storage, path)
+    if !source.nil?()
+      return shell.expand(source)
+    end
+
+    storage = shell.expand(storage)
+
+    if path.start_with?('~/')
+      result = ::File.join(storage, path[1..-1])
+    elsif path.start_with?('/')
+      result = ::File.join(storage, path[1..-1])
+    else
+      result = ::File.join(storage, path)
+    end
+
+    return result
+  end
 
   def init()
     super()
@@ -14,18 +30,17 @@ class Balmora::Command::File < Balmora::Command
   end
 
   def options()
-    return super().concat([:file, :source, :storage, :action, :check_equal,
+    return super().concat([:file, :source, :storage, :action, :always,
       :options])
   end
 
   def run()
-    if !_run_required?()
+    if  @always == true || _source_equals_to_target?()
       return nil
     end
 
     _create_target_path()
     _copy_file()
-    # _change_file_owner()
   end
 
   def verify()
@@ -53,51 +68,21 @@ class Balmora::Command::File < Balmora::Command
   protected
 
   def _create_target_path()
-    @shell.run!(['mkdir', '-p', ::File.dirname(_target_path())], verbose: false)
+    check = ['test', '-e', ::File.dirname(_target_path())]
+    if @shell.run(check, verbose: false)[0] == 0
+      return
+    end
+
+    mkdir = ['mkdir', '-p', ::File.dirname(_target_path())]
+    @shell.run!(mkdir, change: true)
   end
 
   def _copy_file()
-    @shell.run!(['cp', option(:options) || OPTIONS, _source_path(),
-      _target_path()])
+    @shell.run!(['cp', option(:options) || '-T', _source_path(),
+      _target_path()], change: true)
   end
 
-  # def _change_file_owner()
-  #   new_owner = _get_target_required_owner()
-  #   if _get_target_actual_owner() == new_owner
-  #     return
-  #   end
-
-  #   @shell.run!(['chown', new_owner, '-R', _target_path()])
-  # end
-
-  # def _get_target_actual_owner()
-  #   owner =
-  #     @shell.run!(['stat', '-c', '%U:%G', _target_path()], verbose: false).
-  #     strip()
-
-  #   return owner
-  # end
-
-  # def _get_target_required_owner()
-  #   owner =
-  #     if @action == 'pull'
-  #       @owner
-  #     elsif @action == 'push'
-  #       @storage_owner
-  #     else
-  #       raise Error.new("Can not get owner for action #{@action}")
-  #     end
-
-  #   owner = owner || @shell.user_id()
-
-  #   return owner
-  # end
-
-  def _run_required?()
-    # if @check_equal == false
-    #   return true
-    # end
-
+  def _source_equals_to_target?()
     command = [
       'test', '-e', _source_path(), _expr('&&'),
       *@shell.sudo(), 'test', '-e', _target_path(), _expr('&&'),
@@ -106,7 +91,7 @@ class Balmora::Command::File < Balmora::Command
       _expr('"$('), *@shell.sudo(), *_target_contents(), _expr('| md5sum)" ]'),
     ]
 
-    return @shell.run(command, verbose: false)[0] != 0
+    return @shell.run(command, verbose: false)[0] == 0
   end
 
   def _source_contents()
@@ -129,14 +114,6 @@ class Balmora::Command::File < Balmora::Command
     return @shell.expression(expression)
   end
 
-  def _owner()
-    return @owner || ENV['USER']
-  end
-
-  def _storage_owner()
-    return @storage_owner || ENV['USER']
-  end
-
   private
 
   def _files()
@@ -148,21 +125,7 @@ class Balmora::Command::File < Balmora::Command
   end
 
   def _resolve_source_path()
-    if !@source.nil?()
-      return @shell.expand(@source)
-    end
-
-    storage = @shell.expand(@storage)
-
-    if @file.start_with?('~/')
-      result = ::File.join(storage, @file[1..-1])
-    elsif @file.start_with?('/')
-      result = ::File.join(storage, @file[1..-1])
-    else
-      result = ::File.join(storage, @file)
-    end
-
-    return result
+    return File.resolve_path(@shell, @source, @storage, @file)
   end
 
 end

data/lib/balmora/command/files.rb

@@ -62,8 +62,8 @@ class Balmora::Command::Files < Balmora::Command
         path = @shell.expand(path)
       end
 
-      command = ['test', '-d', path, @shell.expression('&&'), 'find', path,
-        '-type', 'f']
+      command = ['test', '-d', path, @shell.expression('&&'), *@shell.sudo(),
+        'find', path, '-type', 'f']
 
       dir_status, dir_files = @shell.run(command, verbose: false)
       if dir_status != 0

data/lib/balmora/command/link.rb

@@ -0,0 +1,106 @@
+class Balmora::Command::Link < Balmora::Command
+
+  class Error < StandardError; end
+
+  def init()
+    super()
+
+    @link = @variables.inject(@link)
+    @source = @variables.inject(@source)
+    @storage = @variables.inject(@storage)
+  end
+
+  def options()
+    return super().concat([:link, :source, :storage])
+  end
+
+  def run()
+    if _exists?(_target())
+      if _link_exists?()
+        return
+      end
+
+      if !_exists?(_source())
+        @shell.run!(['mkdir', '-p', ::File.dirname(_source())], change: true)
+        @shell.run!(['mv', _target(), _source()], change: true)
+      elsif _equals?(_source(), _target())
+        @shell.run!(['rm', '-rf', _target()], change: true)
+      end
+    end
+
+    _create_target_path()
+    @shell.run!(['ln', @options || '-s', _source(), _target()], change: true)
+  end
+
+  def _exists?(file)
+    status, _ = @shell.run(['test', '-e', file], verbose: false)
+    return status == 0
+  end
+
+  def _link_exists?(d = false)
+    stat_status, stat_result = @shell.run(['stat', _target()],
+      verbose: false)
+
+    if stat_status != 0
+      return false
+    end
+
+    if d
+      p([_target, stat_status, stat_result])
+    end
+
+    if !stat_result.include?(_source())
+      return false
+    end
+
+    return true
+  end
+
+  def verify()
+    if @link.nil?()
+      raise Error.new('"link" should be defined')
+    end
+
+    if !@storage.nil?() && !@source.nil?()
+      raise Error.new('"storage" and "source" could not be defined together')
+    end
+
+    if @storage.nil?() && @source.nil?()
+      raise Error.new('"storage" or "source" should be defined')
+    end
+  end
+
+  def _equals?(file1, file2)
+    command = [
+      'test', '-e', file1, _expr('&&'),
+      *@shell.sudo(), 'test', '-e', file2, _expr('&&'),
+      _expr('[ "$('), *@shell.sudo(), 'cat', file1, _expr('| md5sum'),
+        _expr(')" = '),
+      _expr('"$('), *@shell.sudo(), 'cat', file2, _expr('| md5sum)" ]')
+    ]
+
+    return @shell.run(command, verbose: false)[0] == 0
+  end
+
+  protected
+
+  def _expr(string)
+    return @shell.expression(string)
+  end
+
+  def _create_target_path()
+    @shell.run!(
+      ['mkdir', '-p', ::File.dirname(@shell.expand(@link))],
+      verbose: false
+    )
+  end
+
+  def _source()
+    return Balmora::Command::File.resolve_path(@shell, @source, @storage, @link)
+  end
+
+  def _target()
+    return @shell.expand(@link)
+  end
+
+end

data/lib/balmora/command/links.rb

@@ -0,0 +1,45 @@
+class Balmora::Command::Links < Balmora::Command
+
+  class Error < StandardError; end
+
+  def init()
+    super()
+
+    @links = @variables.inject(@links)
+    @storage = @variables.inject(@storage)
+  end
+
+  def options()
+    return super().concat([:links, :storage])
+  end
+
+  def verify()
+    if @links.nil?()
+      raise Error.new('"links" should be defined')
+    end
+
+    if @storage.nil?()
+      raise Error.new('"storage" should be defined')
+    end
+  end
+
+  def run()
+    @links.each() { |link|
+      command = _get_command(link)
+      @balmora.run_command(@state, command)
+    }
+  end
+
+  def _get_command(link)
+    command = (@options || {}).merge(command: 'link', link: link)
+
+    if link.instance_of?(::Hash)
+      command.merge!(link)
+    end
+
+    command.merge!(storage: @storage)
+
+    return command
+  end
+
+end

data/lib/balmora/command/yaourt.rb

@@ -1,3 +1,5 @@
+require 'balmora/command/pacman'
+
 class Balmora::Command::Yaourt < Balmora::Command::Pacman
 
   def initialize(state, command)

data/lib/balmora/config.rb

@@ -74,7 +74,7 @@ class Balmora::Config
     @old = _deep_clone(@config)
 
     Dir.chdir(File.dirname(@path)) {
-      @config = _load(@path)
+      @config = _load(File.basename(@path))
     }
 
     @config[:config_dir] = File.dirname(@path)

data/lib/balmora/context.rb

@@ -31,7 +31,7 @@ class Balmora::Context < Balmora::Command
   end
 
   def options()
-    return [:operator, :value]
+    return [:operator, :operand]
   end
 
   def verify()
@@ -39,8 +39,8 @@ class Balmora::Context < Balmora::Command
       raise Error.new('"operator" should be defined')
     end
 
-    if @value.nil?()
-      raise Error.new('"value" should be defined')
+    if @operand.nil?()
+      raise Error.new('"operand" should be defined')
     end
   end
 
@@ -57,17 +57,17 @@ class Balmora::Context < Balmora::Command
 
     case operator
       when 'match'
-        return _not(is_not, result.match(@value) != nil)
+        return _not(is_not, result.match(@operand) != nil)
       when 'equal'
-        return _not(is_not, result == @value)
+        return _not(is_not, result == @operand)
       when 'greater'
-        return _not(is_not, result > @value)
+        return _not(is_not, result > @operand)
       when 'greater-or-equal'
-        return _not(is_not, result >= @value)
+        return _not(is_not, result >= @operand)
       when 'lesser'
-        return _not(is_not, result < @value)
+        return _not(is_not, result < @operand)
       when 'lesser-or-equal'
-        return _not(is_not, result <= @value)
+        return _not(is_not, result <= @operand)
     end
 
     raise Error.new("Unknown operator #{operator}")

data/lib/balmora/context/value.rb

@@ -0,0 +1,19 @@
+class Balmora::Context::Value < Balmora::Context
+
+  def options()
+    return super().concat([:value])
+  end
+
+  def verify()
+    if !@value
+      raise Error.new('"value" should be defined')
+    end
+
+    super()
+  end
+
+  def run()
+    return @variables.inject(@value)
+  end
+
+end

data/lib/balmora/contexts.rb

@@ -25,11 +25,10 @@ class Balmora::Contexts
         context: 'exec-result',
         exec: context,
         operator: 'equal',
-        value: 0,
+        operand: 0,
       }
     end
 
-
     context_class = @extension.get(Balmora::Context, context[:context])
     context_instance = context_class.new(@state, context)
     context_instance.init()
@@ -67,10 +66,4 @@ class Balmora::Contexts
     return result
   end
 
-end
-
-# [
-#   {"context": "test -e folder/file1; echo $?", "operator": "equal", "value": "0"},
-#   "or",
-#   {"context": "test -e folder/file2; echo $?", "operator": "equal", "value": "0"},
-# ]
+end

data/lib/balmora/extension/file_secret.rb

@@ -7,10 +7,10 @@ module Balmora::Extension::FileSecret
   def _copy_file()
     if @action == 'pull'
       @shell.run!(_source_contents() + [_expr('|'), *@shell.sudo(), 'tee',
-        _target_path()])
+        _target_path()], change: true)
     else
       @shell.run!(['cat', _source_path(), _expr('|'), *_encrypt(), _expr('|'),
-        *@shell.sudo(), 'tee', _target_path()])
+        *@shell.sudo(), 'tee', _target_path()], change: true)
     end
   end
 

data/lib/balmora/logger.rb

@@ -1,10 +1,21 @@
 require 'logger'
+require 'term/ansicolor'
 
 class Balmora::Logger < Logger
 
   def self.factory(state)
     logger = self.new(STDOUT)
 
+    logger.formatter = proc { |severity, _, _, msg|
+      if severity == 'DEBUG'
+        puts(Term::ANSIColor.blue() { msg })
+      elsif severity == 'INFO'
+        puts(Term::ANSIColor.green() { msg })
+      elsif severity == 'ERROR'
+        puts(Term::ANSIColor.red() { msg })
+      end
+    }
+
     if state.options[:debug] == true && state.options[:quite] == true
       raise Error.new("Options --quite and --verbose can not be set " +
         "simulataneously")

data/lib/balmora/shell.rb

@@ -6,9 +6,9 @@ class Balmora::Shell
 
     attr_reader :status
 
-    def initialize(message, status)
+    def initialize(message, status = nil)
       super(message)
-      @status = status
+      @status = status || 1
     end
 
   end
@@ -27,11 +27,13 @@ class Balmora::Shell
   attr_reader :home, :user_id
 
   def self.factory(state)
-    return self.new(state.logger)
+    return self.new(state.logger, state.options[:dry])
   end
 
-  def initialize(logger, home = nil)
+  def initialize(logger, dry, home = nil)
     @logger = logger
+    @dry = dry
+
     @run = ::Object.method(:'`')
     @system = ::Object.method(:system)
     @status = Proc.new() { $?.exitstatus }
@@ -70,12 +72,22 @@ class Balmora::Shell
       }.
       join(' ')
 
+    dry = false
+    if options[:change] == true && @dry
+      dry = true
+      shell_command = "dry: #{shell_command}"
+    end
+
     if options[:verbose] != false
       @logger.info(shell_command)
     else
       @logger.debug(shell_command)
     end
 
+    if dry
+      return 0, ''
+    end
+
     method = @run
     if options[:system] == true
       method = @system

data/lib/balmora/variables/options.rb

@@ -0,0 +1,7 @@
+class Balmora::Variables::Options
+
+  def self.factory(state)
+    return state.options
+  end
+
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: balmora
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Leonid Shagabutdinov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
-dependencies: []
+date: 2015-08-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Balmora - linux task runner
 email: leonid@shagabutdinov.com
 executables:
@@ -26,6 +40,8 @@ files:
 - lib/balmora/command/exec.rb
 - lib/balmora/command/file.rb
 - lib/balmora/command/files.rb
+- lib/balmora/command/link.rb
+- lib/balmora/command/links.rb
 - lib/balmora/command/pacman.rb
 - lib/balmora/command/reload_config.rb
 - lib/balmora/command/restart.rb
@@ -37,6 +53,7 @@ files:
 - lib/balmora/context/config_changed.rb
 - lib/balmora/context/exec.rb
 - lib/balmora/context/exec_result.rb
+- lib/balmora/context/value.rb
 - lib/balmora/contexts.rb
 - lib/balmora/extension.rb
 - lib/balmora/extension/file_secret.rb
@@ -46,6 +63,7 @@ files:
 - lib/balmora/state.rb
 - lib/balmora/variables.rb
 - lib/balmora/variables/config.rb
+- lib/balmora/variables/options.rb
 - lib/balmora/variables/variables.rb
 homepage: http://github.com/shagabutdinov/balmora
 licenses: