git_compound 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fcf9e29c1abe4d4c3fe2287e8559cd84035b8a7
-  data.tar.gz: b2746150e9f9fc1dfe86a5a12287606a85411302
+  metadata.gz: 06924151a5c14eac3ffebfc3005358de3e85a7e9
+  data.tar.gz: bbb37c1178dea881ad1dbc016fe8047dc028eddd
 SHA512:
-  metadata.gz: d0ab07e4b756841e02a71a62043bc67292a6de43b6e8c2abc811c0b6cf05c9f3fa9a2d305db945a7a625c5e563c38263af4de7be899e8b6d133b36edc9bcde21
-  data.tar.gz: 4b9f4a83e653c1f9c1e6ed5b1c69e558617e9537e29d13f588a7f1c67c7d253a28b59281f81e6831f3a7c3ab5e14915946557655950842f434545f8e0a5b4f2a
+  metadata.gz: 84227d3ee9e3bb7abd77b61bab4600bd6a3b0d2fbd05a97c6470ac6f2933ea12700772d0a796cc1703254645997e537f000388ea7f0413a4bb6d94ae007a3c5a
+  data.tar.gz: 64797a7958521128971997327b9f23f3ee46fdeafa7e1afe3f45d04b24ec39a9cedec7df20b246abe4a9b7051d67e812722e0e575e5fc3ee7cf784d4dd89c912

data/git_compound.gemspec

@@ -6,9 +6,9 @@ require 'git_compound/version'
 Gem::Specification.new do |spec|
   spec.name          = 'git_compound'
   spec.version       = GitCompound::VERSION
-  spec.authors       = ['Grzegorz Bizon']
-  spec.email         = ['grzegorz.bizon@ntsn.pl']
-  spec.summary       = 'Compose you project using git repositories and ruby tasks'
+  spec.authors       = ['Grzegorz Bizon', 'Tomasz Maczukin']
+  spec.email         = ['grzegorz.bizon@ntsn.pl', 'tomasz@maczukin.pl']
+  spec.summary       = 'Compose you project using Git repositories and ruby tasks'
   spec.homepage      = 'https://github.com/grzesiek/git_compound'
   spec.license       = 'MIT'
 
@@ -17,14 +17,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  # rubocop:disable Style/SingleSpaceBeforeFirstArg
   spec.add_development_dependency 'bundler',   '~> 1.8'
   spec.add_development_dependency 'rake',      '~> 10.0'
-  spec.add_development_dependency 'rubocop',   '~> 0.31.0'
+  spec.add_development_dependency 'rubocop',   '~> 0.33'
   spec.add_development_dependency 'rspec',     '~> 3.2.0'
   spec.add_development_dependency 'pry',       '~> 0.10.1'
   spec.add_development_dependency 'simplecov', '~> 0.10.0'
-  # rubocop:enable Style/SingleSpaceBeforeFirstArg
 
   spec.requirements << 'git scm version > 2'
   spec.requirements << 'gnu tar'

data/lib/git_compound/command/arguments/parser.rb

@@ -0,0 +1,74 @@
+module GitCompound
+  module Command
+    module Arguments
+      # Class responsible for parsing ARGV for given procedure
+      #
+      class Parser
+        def initialize(argv, global)
+          @global = global
+          @args   = format_arguments(argv)
+        end
+
+        def procedure
+          Command.const_get("Procedure::#{command.capitalize}")
+        rescue
+          Procedure::Help
+        end
+
+        def options
+          arguments = @args - @global - [command]
+          found = {}
+
+          option_each(procedure.options) do |name, type|
+            option = type.new(name, arguments)
+            next unless option.valid?
+
+            arguments -= option.used
+            found.merge!(option.parse)
+          end
+
+          return found if arguments.empty?
+          raise UnknownArgumentError,
+                "Unknown arguments `#{arguments.inspect}`"
+        end
+
+        def global
+          @args & @global
+        end
+
+        def command
+          @args.find { |arg| arg.is_a?(String) }
+        end
+
+        private
+
+        def format_arguments(argv)
+          argv.map do |arg|
+            arg.start_with?('--') ? arg.sub(/^--/, '').tr('-', '_').to_sym : arg
+          end
+        end
+
+        def option_each(expected)
+          # parameters first, arguments last
+          opts = expected.sort_by { |_key, value| value[:variant] }.reverse
+
+          opts.each do |opt|
+            name = opt.first
+            type = option_type(opt.last)
+
+            yield name, type
+          end
+        end
+
+        def option_type(metadata)
+          variant = metadata[:variant].capitalize
+          type = metadata[:type].capitalize
+          Arguments::Type.const_get("#{variant}::#{type}")
+        rescue NameError
+          raise GitCompoundError,
+                "Unknown option variant or type `#{variant}`, `#{type}`"
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/arguments/type/argument/argument.rb

@@ -0,0 +1,23 @@
+module GitCompound
+  module Command
+    module Arguments
+      module Type
+        module Argument
+          # Abstract argument type
+          #
+          class Argument < Type
+            def used
+              [value!].compact
+            end
+
+            private
+
+            def value!
+              raise NotImplementedError
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/arguments/type/argument/string.rb

@@ -0,0 +1,27 @@
+module GitCompound
+  module Command
+    module Arguments
+      module Type
+        module Argument
+          # String argument implementation
+          #
+          class String < Argument
+            def valid?
+              value!.is_a?(::String)
+            end
+
+            private
+
+            def value!
+              @args.find { |arg| arg.is_a?(::String) }
+            end
+
+            def value
+              value!.to_s
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/arguments/type/parameter/boolean.rb

@@ -0,0 +1,27 @@
+module GitCompound
+  module Command
+    module Arguments
+      module Type
+        module Parameter
+          # Boolean parameter implmentation
+          #
+          class Boolean < Parameter
+            def valid?
+              @args.include?(@key)
+            end
+
+            private
+
+            def value!
+              nil
+            end
+
+            def value
+              true
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/arguments/type/parameter/parameter.rb

@@ -0,0 +1,23 @@
+module GitCompound
+  module Command
+    module Arguments
+      module Type
+        module Parameter
+          # Abstract parameter type
+          #
+          class Parameter < Type
+            def used
+              valid? ? [@key, value!].compact : []
+            end
+
+            private
+
+            def value!
+              @args[@args.index(@key) + 1]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/arguments/type/parameter/string.rb

@@ -0,0 +1,23 @@
+module GitCompound
+  module Command
+    module Arguments
+      module Type
+        module Parameter
+          # String parameter implementation
+          #
+          class String < Parameter
+            def valid?
+              @args.include?(@key) && value!.is_a?(::String)
+            end
+
+            private
+
+            def value
+              value!.to_s
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/arguments/type/type.rb

@@ -0,0 +1,48 @@
+module GitCompound
+  module Command
+    module Arguments
+      module Type
+        # Abstract argument type
+        #
+        class Type
+          def initialize(key, args)
+            @key  = key
+            @args = args
+          end
+
+          def parse
+            valid? ? { @key => value } : {}
+          end
+
+          # Return true if arguments array contains
+          # this parameter/argument, else - return false
+          #
+          def valid?
+            raise NotImplementedError
+          end
+
+          # Returns array of arguments that has been used
+          #
+          def used
+            raise NotImplementedError
+          end
+
+          private
+
+          # Returns bare value extracted from args
+          # or nil if bare arguments is irrelevant
+          #
+          def value!
+            raise NotImplementedError
+          end
+
+          # Return value converted to valid type
+          #
+          def value
+            raise NotImplementedError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/options.rb

@@ -1,31 +1,22 @@
+require 'forwardable'
+
 module GitCompound
   module Command
     # Class that parses command arguments
     #
     class Options
-      GLOBAL_OPTIONS = [:verbose, :disable_colors]
+      extend Forwardable
 
-      def initialize(args)
-        @command, @args = parse_options(args)
+      GLOBAL_OPTIONS = [:verbose, :disable_colors]
+      delegate [:procedure, :global, :options, :command] => :@parser
 
-        self.class.disable_colors = false
+      def initialize(argv)
+        @parser = Arguments::Parser.new(argv, GLOBAL_OPTIONS)
         set_global_options
       end
 
-      def global_options
-        @args & GLOBAL_OPTIONS
-      end
-
-      def command_options
-        @args - GLOBAL_OPTIONS
-      end
-
-      def command
-        @command || 'help'
-      end
-
       def parse
-        [command, command_options]
+        [procedure, options]
       end
 
       def self.verbose=(mode)
@@ -38,16 +29,10 @@ module GitCompound
 
       private
 
-      def parse_options(args)
-        opts_dash = args.select { |opt| opt.start_with?('--') }
-        opts_string = args - opts_dash
-        command = opts_string.shift
-        opts_sym = opts_dash.collect { |opt| opt.sub(/^--/, '').gsub('-', '_').to_sym }
-        [command, opts_string + opts_sym]
-      end
-
       def set_global_options
-        global_options.each do |option|
+        self.class.disable_colors = false
+
+        global.each do |option|
           self.class.public_send("#{option}=", true)
         end
       end

data/lib/git_compound/command/procedure/build.rb

@@ -0,0 +1,24 @@
+module GitCompound
+  module Command
+    module Procedure
+      # Build command class
+      #
+      class Build < Procedure
+        include Element::Lock
+        include Element::Option
+        include Element::Subprocedure
+
+        add_subprocedure :build_lock,     BuildLock
+        add_subprocedure :build_manifest, BuildManifest
+
+        def execute
+          if locked?
+            subprocedure(:build_lock)
+          else
+            subprocedure(:build_manifest)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/build_lock.rb

@@ -0,0 +1,40 @@
+module GitCompound
+  module Command
+    module Procedure
+      # BuildLock procedure class
+      #
+      class BuildLock < Procedure
+        include Element::Manifest
+        include Element::Lock
+        include Element::Subprocedure
+
+        add_subprocedure :tasks_runner, Tasks
+
+        def execute
+          Logger.info 'Building components from lockfile ...'
+
+          verify_manifest
+          build_locked_components
+          execute_tasks
+        end
+
+        private
+
+        def verify_manifest
+          return if @manifest.md5sum == @lock.manifest
+
+          raise GitCompoundError,
+                'Manifest md5sum has changed ! Use `update` command.'
+        end
+
+        def build_locked_components
+          @lock.process(Worker::ComponentDispatcher.new(@lock))
+        end
+
+        def execute_tasks
+          subprocedure(:tasks_runner)
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/build_manifest.rb

@@ -0,0 +1,44 @@
+module GitCompound
+  module Command
+    module Procedure
+      # BuildManifest procedure class
+      #
+      class BuildManifest < Procedure
+        include Element::Manifest
+        include Element::Lock
+        include Element::Subprocedure
+
+        add_subprocedure :check_dependencies, Check
+        add_subprocedure :tasks_runner,       Tasks
+
+        def execute
+          Logger.info 'Building components ...'
+
+          check_dependencies
+          build_manifest
+          execute_tasks
+          lock_manifest
+        end
+
+        private
+
+        def check_dependencies
+          subprocedure(:check_dependencies)
+        end
+
+        def build_manifest
+          @manifest.process(Worker::ComponentBuilder.new(@lock))
+        end
+
+        def execute_tasks
+          subprocedure(:tasks_runner)
+        end
+
+        def lock_manifest
+          @lock.lock_manifest(@manifest)
+          @lock.write
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/check.rb

@@ -0,0 +1,25 @@
+module GitCompound
+  module Command
+    module Procedure
+      # Check command procedure class
+      #
+      class Check < Procedure
+        include Element::Manifest
+
+        def execute!
+          execute
+          Logger.info 'OK'
+        end
+
+        def execute
+          Logger.info 'Checking dependencies ...'
+
+          @manifest.process(
+            Worker::CircularDependencyChecker.new,
+            Worker::NameConstraintChecker.new,
+            Worker::ConflictingDependencyChecker.new)
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/element/lock.rb

@@ -0,0 +1,22 @@
+module GitCompound
+  module Command
+    module Procedure
+      module Element
+        # Lock mixin
+        #
+        module Lock
+          def initialize(opts)
+            @lock     = GitCompound::Lock.new
+            @lock_new = GitCompound::Lock.new.clean
+
+            super
+          end
+
+          def locked?
+            GitCompound::Lock.exist?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/element/manifest.rb

@@ -0,0 +1,36 @@
+module GitCompound
+  module Command
+    module Procedure
+      module Element
+        # Manifest mixin
+        #
+        module Manifest
+          def initialize(opts)
+            super
+            @manifest = manifest_load(opts[:manifest])
+          end
+
+          def self.included(parent_class)
+            parent_class.class_eval do
+              include Element::Option
+              add_argument :manifest, type: :string, scope: :global
+            end
+          end
+
+          private
+
+          def manifest_load(filename)
+            files = filename ? [filename] : GitCompound::Manifest::FILENAMES
+            found = files.select { |file| File.exist?(file) }
+
+            raise GitCompoundError,
+                  "Manifest `#{filename || files.inspect}` not found !" if found.empty?
+
+            contents = File.read(found.first)
+            GitCompound::Manifest.new(contents)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/element/option.rb

@@ -0,0 +1,49 @@
+module GitCompound
+  module Command
+    module Procedure
+      module Element
+        # Option mixin
+        #
+        module Option
+          def initialize(opts)
+            @opts = opts
+            super
+          end
+
+          def self.included(parent_class)
+            parent_class.extend(ClassMethods)
+          end
+
+          private
+
+          # Class methods
+          #
+          module ClassMethods
+            def add_parameter(name, metadata)
+              add_option(name, :parameter, metadata)
+            end
+
+            def add_argument(name, metadata)
+              add_option(name, :argument, metadata)
+            end
+
+            def options
+              (@options || {}).merge(super)
+            end
+
+            private
+
+            def add_option(name, variant, metadata)
+              @options = {} unless @options
+
+              raise GitCompoundError, 'You need to specify type of an option !' unless
+                metadata.include?(:type)
+
+              @options.store(name, metadata.merge(variant: variant))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/element/subprocedure.rb

@@ -0,0 +1,53 @@
+module GitCompound
+  module Command
+    module Procedure
+      module Element
+        # Subprocedure mixin
+        #
+        module Subprocedure
+          def self.included(parent_class)
+            parent_class.extend(ClassMethods)
+          end
+
+          def initialize(args)
+            @subprocedures = {}
+
+            self.class.subprocedures.to_h.each_pair do |name, procedure|
+              @subprocedures.store(name, procedure.new(args))
+            end
+
+            super
+          end
+
+          def subprocedure(name)
+            @subprocedures[name.to_sym].execute
+          end
+
+          # Class methods for extended class
+          #
+          module ClassMethods
+            attr_reader :subprocedures
+
+            def add_subprocedure(name, procedure)
+              @subprocedures = {} unless @subprocedures
+              @subprocedures.store(name.to_sym, procedure)
+            end
+
+            def options
+              subprocedure_options = {}
+              @subprocedures.to_h.each do |_, procedure|
+                subprocedure_options.merge!(procedure.options)
+              end
+
+              subprocedure_options.select! do |_param, metadata|
+                metadata[:scope] == :global
+              end
+
+              subprocedure_options.merge(super)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/help.rb

@@ -0,0 +1,55 @@
+module GitCompound
+  module Command
+    module Procedure
+      # Help command procedure
+      #
+      class Help < Procedure
+        def execute
+          Logger.info(message)
+        end
+
+        def message
+          self.class.message
+        end
+
+        # rubocop:disable Metrics/AbcSize
+        def self.message
+          <<-EOS
+        #{'GitCompound version'.bold.yellow} #{GitCompound::VERSION.bold}
+
+        Usage: #{'gitcompound'.bold.green}
+          #{'[options]'.green} #{'command'.bold} #{'[manifest_file]'.green}
+
+        Commands:
+          #{'build'.bold}
+              builds project from manifest (or lockfile if present)
+
+              If manifest is not specified it uses one of
+              #{Manifest::FILENAMES.inspect}
+
+          #{'update'.bold}
+              updates project
+
+          #{'check'.bold}
+              detects circular depenencies, conflicting dependencies
+              and checks for name contraints
+
+          #{'show'.bold}
+              prints structure of project
+
+          #{'help'.bold}
+              prints this help
+
+        Options:'
+          #{'--verbose'.bold}
+              prints verbose log info
+
+          #{'--disable-colors'.bold}
+              disable ANSI colors in output
+          EOS
+        end
+        # rubocop:enable Metrics/AbcSize
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/procedure.rb

@@ -0,0 +1,37 @@
+module GitCompound
+  module Command
+    module Procedure
+      # Abstract Procedure class
+      #
+      class Procedure
+        def initialize(_opts)
+        end
+
+        # Method with additional messages etc.
+        #
+        def execute!
+          execute
+        end
+
+        # Main procedure entry point
+        #
+        def execute
+          raise NotImplementedError
+        end
+
+        # Valid options available for this procedure
+        # see Element::Option
+        #
+        def self.options
+          {}
+        end
+
+        # Name of procedure
+        #
+        def self.to_s
+          name.split('::').last.downcase
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/show.rb

@@ -0,0 +1,22 @@
+module GitCompound
+  module Command
+    module Procedure
+      # Show command procedure class
+      #
+      class Show < Procedure
+        include Element::Manifest
+
+        def execute!
+          Logger.info 'Processing components list ...'
+          execute
+        end
+
+        def execute
+          @manifest.process(
+            Worker::CircularDependencyChecker.new,
+            Worker::PrettyPrint.new)
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/tasks.rb

@@ -0,0 +1,27 @@
+module GitCompound
+  module Command
+    module Procedure
+      # Check command procedure class
+      #
+      class Tasks < Procedure
+        include Element::Manifest
+        include Element::Option
+
+        add_parameter :allow_nested_subtasks, type: :boolean, scope: :global
+        # add_parameter :list, type: Argument::StringBoolean
+
+        def execute
+          Logger.info 'Running tasks ...'
+
+          if @opts[:allow_nested_subtasks]
+            @manifest.process(Worker::TaskRunner.new)
+          else
+            @manifest.tasks.each_value do |task|
+              Worker::TaskRunner.new.visit_task(task)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command/procedure/update.rb

@@ -0,0 +1,66 @@
+module GitCompound
+  module Command
+    module Procedure
+      # Update command procedure class
+      #
+      class Update < Procedure
+        include Element::Manifest
+        include Element::Lock
+        include Element::Subprocedure
+
+        add_subprocedure :check_dependencies, Check
+        add_subprocedure :tasks_runner,       Tasks
+
+        def execute
+          raise GitCompoundError,
+                "Lockfile `#{Lock::FILENAME}` does not exist ! " \
+                'You should use `build` command.' unless locked?
+
+          protect_local_modifications
+          check_dependencies
+          update
+          execute_tasks
+          lock_updated_manifest
+          remove_dormant_components
+        end
+
+        private
+
+        def protect_local_modifications
+          @lock.process(Worker::LocalChangesGuard.new(@lock))
+        end
+
+        def check_dependencies
+          subprocedure(:check_dependencies)
+        end
+
+        def update
+          Logger.info 'Updating components ...'
+          @manifest.process(Worker::ComponentDispatcher.new(@lock_new))
+        end
+
+        def execute_tasks
+          subprocedure(:tasks_runner)
+        end
+
+        def lock_updated_manifest
+          @lock_new.lock_manifest(@manifest)
+          @lock_new.write
+        end
+
+        def remove_dormant_components
+          dormant_components = @lock.components.reject do |component|
+            @lock_new.find(component) ? true : false
+          end
+
+          dormant_components.each do |component|
+            Logger.warn "Removing dormant component `#{component.name}` " \
+                        "from `#{component.path}` !"
+
+            component.remove!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_compound/command.rb

@@ -2,111 +2,30 @@ module GitCompound
   # GitCompount command facade
   #
   module Command
-    def build(*args)
-      if Lock.exist?
-        builder(args)
-          .locked_manifest_verify
-          .locked_components_build
-          .tasks_execute
-      else
-        builder(args)
-          .dependencies_check
-          .manifest_build
-          .tasks_execute
-          .manifest_lock
-      end
+    def build(manifest, opts = {})
+      run(Procedure::Build, opts.merge(manifest: manifest))
     end
 
-    def update(*args)
-      raise GitCompoundError,
-            "Lockfile `#{Lock::FILENAME}` does not exist ! " \
-            'You should use `build` command.' unless Lock.exist?
-
-      builder(args)
-        .locked_components_guard
-        .dependencies_check
-        .manifest_update
-        .tasks_execute
-        .manifest_lock
-        .locked_dormant_components_remove
+    def update(manifest, opts = {})
+      run(Procedure::Update, opts.merge(manifest: manifest))
     end
 
-    def check(*args)
-      builder(args).dependencies_check
-      Logger.info 'OK'
+    def check(manifest, opts = {})
+      run(Procedure::Check, opts.merge(manifest: manifest))
     end
 
-    def show(*args)
-      builder(args).components_show
+    def show(manifest, opts = {})
+      run(Procedure::Show, opts.merge(manifest: manifest))
     end
 
-    def help(*_args)
-      Logger.info(usage)
+    def help(opts = {})
+      run(Procedure::Help, opts)
     end
 
-    def run(command, args)
-      abort(usage) unless methods.include?(command.to_sym)
-      public_send(command, *args)
+    def run(procedure, opts)
+      procedure.new(opts).execute!
     rescue GitCompoundError => e
-      abort Logger.parse("Error: #{e.message}".on_red.white.bold)
-    end
-
-    private
-
-    def builder(args)
-      filename = args.find { |arg| arg.is_a? String }
-      Builder.new(manifest(filename), Lock.new, args)
-    end
-
-    def manifest(filename)
-      files = filename ? [filename] : Manifest::FILENAMES
-      found = files.select { |file| File.exist?(file) }
-
-      raise GitCompoundError,
-            "Manifest `#{filename || files.inspect}` not found !" if found.empty?
-
-      contents = File.read(found.first)
-      Manifest.new(contents)
-    end
-
-    # rubocop:disable Metrics/AbcSize
-    def usage
-      msg = <<-EOS
-  #{'GitCompound version'.bold.yellow} #{GitCompound::VERSION.bold}
-
-  Usage: #{'gitcompound'.bold.green} #{
-    '[options]'.green} #{'command'.bold} #{'[manifest_file]'.green}
-
-  Commands:
-    #{'build'.bold}
-        builds project from manifest (or lockfile if present)
-
-        If manifest is not specified it uses one of
-        #{Manifest::FILENAMES.inspect}
-
-    #{'update'.bold}
-        updates project
-
-    #{'check'.bold}
-        detects circular depenencies, conflicting dependencies
-        and checks for name contraints
-
-    #{'show'.bold}
-        prints structure of project
-
-    #{'help'.bold}
-        prints this help
-
-  Options:'
-    #{'--verbose'.bold}
-        prints verbose log info
-
-    #{'--disable-colors'.bold}
-        disable ANSI colors in output
-      EOS
-
-      Logger.parse(msg)
+      abort "Error: #{e.message}".on_red.white.bold
     end
-    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/git_compound/component/version/version_strategy.rb

@@ -37,7 +37,7 @@ module GitCompound
         end
 
         def ==(other)
-          to_s == other.to_s
+          sha == other.sha
         end
       end
     end

data/lib/git_compound/component.rb

@@ -44,6 +44,7 @@ module GitCompound
       @destination.repository do |repo|
         repo.fetch
         repo.checkout(@source.ref)
+        repo.fetch
         repo.merge if repo.branch?(@source.ref)
       end
     end

data/lib/git_compound/exceptions.rb

@@ -13,4 +13,5 @@ module GitCompound
   class ConflictingDependencyError < GitCompoundError; end
   class NameConstraintError < GitCompoundError; end
   class LocalChangesError < GitCompoundError; end
+  class UnknownArgumentError < GitCompoundError; end
 end

data/lib/git_compound/logger/core_ext/string.rb

@@ -1,5 +1,4 @@
-# rubocop:disable Style/Documentation
-class String
+class String # rubocop:disable Style/Documentation
   include GitCompound::Logger::Colors
 end
 # rubocop:enable Style/Documentation

data/lib/git_compound/logger.rb

@@ -10,7 +10,7 @@ module GitCompound
     end
 
     def verbose
-      @verbose ||= false
+      @verbose.nil? ? false : @verbose
     end
 
     def colors=(value)
@@ -18,7 +18,7 @@ module GitCompound
     end
 
     def colors
-      @colors ||= true
+      @colors.nil? ? true : @colors
     end
 
     def inline(inline_message)
@@ -42,10 +42,6 @@ module GitCompound
       log error_message.on_red.white.bold
     end
 
-    def parse(message)
-      message
-    end
-
     private
 
     def log(message)

data/lib/git_compound/version.rb

@@ -1,5 +1,5 @@
 # GitCompound
 #
 module GitCompound
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/git_compound.rb

@@ -4,7 +4,6 @@ require 'git_compound/version'
 # Git Compound module
 #
 module GitCompound
-  autoload :Builder,    'git_compound/builder'
   autoload :Command,    'git_compound/command'
   autoload :Component,  'git_compound/component'
   autoload :Lock,       'git_compound/lock'
@@ -42,6 +41,56 @@ module GitCompound
   #
   module Command
     autoload :Options, 'git_compound/command/options'
+
+    # Command Arguments module
+    #
+    module Arguments
+      autoload :Parser, 'git_compound/command/arguments/parser'
+
+      # Argument Type module
+      #
+      module Type
+        autoload :Type, 'git_compound/command/arguments/type/type'
+
+        # Parameter module
+        #
+        module Parameter
+          autoload :Parameter, 'git_compound/command/arguments/type/parameter/parameter'
+          autoload :Boolean,   'git_compound/command/arguments/type/parameter/boolean'
+          autoload :String,    'git_compound/command/arguments/type/parameter/string'
+        end
+
+        # Argument module
+        #
+        module Argument
+          autoload :Argument, 'git_compound/command/arguments/type/argument/argument'
+          autoload :String,   'git_compound/command/arguments/type/argument/string'
+        end
+      end
+    end
+
+    # Command Procedure
+    #
+    module Procedure
+      autoload :Procedure,     'git_compound/command/procedure/procedure'
+      autoload :Build,         'git_compound/command/procedure/build'
+      autoload :BuildLock,     'git_compound/command/procedure/build_lock'
+      autoload :BuildManifest, 'git_compound/command/procedure/build_manifest'
+      autoload :Check,         'git_compound/command/procedure/check'
+      autoload :Help,          'git_compound/command/procedure/help'
+      autoload :Show,          'git_compound/command/procedure/show'
+      autoload :Tasks,         'git_compound/command/procedure/tasks'
+      autoload :Update,        'git_compound/command/procedure/update'
+
+      # Procedure Element
+      #
+      module Element
+        autoload :Lock,         'git_compound/command/procedure/element/lock'
+        autoload :Manifest,     'git_compound/command/procedure/element/manifest'
+        autoload :Option,       'git_compound/command/procedure/element/option'
+        autoload :Subprocedure, 'git_compound/command/procedure/element/subprocedure'
+      end
+    end
   end
 
   # GitCompound Logger

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: git_compound
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Grzegorz Bizon
+- Tomasz Maczukin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: '0.33'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: '0.33'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +98,7 @@ dependencies:
 description: 
 email:
 - grzegorz.bizon@ntsn.pl
+- tomasz@maczukin.pl
 executables:
 - gitcompound
 extensions: []
@@ -115,9 +117,28 @@ files:
 - exe/gitcompound
 - git_compound.gemspec
 - lib/git_compound.rb
-- lib/git_compound/builder.rb
 - lib/git_compound/command.rb
+- lib/git_compound/command/arguments/parser.rb
+- lib/git_compound/command/arguments/type/argument/argument.rb
+- lib/git_compound/command/arguments/type/argument/string.rb
+- lib/git_compound/command/arguments/type/parameter/boolean.rb
+- lib/git_compound/command/arguments/type/parameter/parameter.rb
+- lib/git_compound/command/arguments/type/parameter/string.rb
+- lib/git_compound/command/arguments/type/type.rb
 - lib/git_compound/command/options.rb
+- lib/git_compound/command/procedure/build.rb
+- lib/git_compound/command/procedure/build_lock.rb
+- lib/git_compound/command/procedure/build_manifest.rb
+- lib/git_compound/command/procedure/check.rb
+- lib/git_compound/command/procedure/element/lock.rb
+- lib/git_compound/command/procedure/element/manifest.rb
+- lib/git_compound/command/procedure/element/option.rb
+- lib/git_compound/command/procedure/element/subprocedure.rb
+- lib/git_compound/command/procedure/help.rb
+- lib/git_compound/command/procedure/procedure.rb
+- lib/git_compound/command/procedure/show.rb
+- lib/git_compound/command/procedure/tasks.rb
+- lib/git_compound/command/procedure/update.rb
 - lib/git_compound/component.rb
 - lib/git_compound/component/destination.rb
 - lib/git_compound/component/source.rb
@@ -192,6 +213,6 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Compose you project using git repositories and ruby tasks
+summary: Compose you project using Git repositories and ruby tasks
 test_files: []
 has_rdoc: 

data/lib/git_compound/builder.rb

@@ -1,95 +0,0 @@
-module GitCompound
-  # Builder class, responsible for building project
-  # from manifest or lockfile
-  #
-  class Builder
-    def initialize(manifest, lock, opts)
-      @manifest = manifest
-      @lock     = lock
-      @opts     = opts
-    end
-
-    def manifest_build
-      Logger.info 'Building components ...'
-      @manifest.process(Worker::ComponentBuilder.new(@lock))
-      self
-    end
-
-    def manifest_update
-      Logger.info 'Updating components ...'
-      @lock_new = Lock.new.clean
-      @manifest.process(Worker::ComponentDispatcher.new(@lock_new))
-      self
-    end
-
-    def manifest_lock
-      lock = @lock_new ? @lock_new : @lock
-      lock.lock_manifest(@manifest)
-      lock.write
-      self
-    end
-
-    def dependencies_check
-      Logger.info 'Checking dependencies ...'
-
-      @manifest.process(
-        Worker::CircularDependencyChecker.new,
-        Worker::NameConstraintChecker.new,
-        Worker::ConflictingDependencyChecker.new)
-      self
-    end
-
-    def components_show
-      Logger.info 'Processing components list ...'
-      @manifest.process(
-        Worker::CircularDependencyChecker.new,
-        Worker::PrettyPrint.new)
-      self
-    end
-
-    def tasks_execute
-      Logger.info 'Running tasks ...'
-
-      if @opts.include?(:allow_nested_subtasks)
-        @manifest.process(Worker::TaskRunner.new)
-      else
-        @manifest.tasks.each_value do |task|
-          Worker::TaskRunner.new.visit_task(task)
-        end
-      end
-      self
-    end
-
-    def locked_manifest_verify
-      return self if @manifest.md5sum == @lock.manifest
-      raise GitCompoundError,
-            'Manifest md5sum has changed ! Use `update` command.'
-    end
-
-    def locked_components_build
-      Logger.info 'Building components from lockfile ...'
-      @lock.process(Worker::ComponentDispatcher.new(@lock))
-      self
-    end
-
-    def locked_components_guard
-      @lock.process(Worker::LocalChangesGuard.new(@lock))
-      self
-    end
-
-    def locked_dormant_components_remove
-      raise GitCompoundError, 'No new lockfile !' unless @lock_new
-
-      dormant_components = @lock.components.reject do |component|
-        @lock_new.find(component) ? true : false
-      end
-
-      dormant_components.each do |component|
-        Logger.warn "Removing dormant component `#{component.name}` " \
-                    "from `#{component.path}` !"
-
-        component.remove!
-      end
-    end
-  end
-end