git_compound 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e127d67e2392d65dea06cf967be3770cba4144bc
-  data.tar.gz: 46dd79cde5f328dd213e7a072cf27b7b69b95fc6
+  metadata.gz: 8db5466d0de881b83ca8d78cfbc1350bd93fe7c9
+  data.tar.gz: 39b0313d49ad5c93eb070249c38cd625c844575c
 SHA512:
-  metadata.gz: 16e0fdc430743a2812def344af9efdae345886414853e0fe4f4566a51f3ff92828403d1c1921ee9d7413a1f6a106a6f3edd7adff96872f1dedad8054581569d8
-  data.tar.gz: d17fba0fdfc018cebfd5fe0c7fcad60e5d9a42c334c3e58f9b345cc45b32ab2e3a32e0bb69740305aec26519308d3d994e5a410ec00921c432e7c9d53edda598
+  metadata.gz: a99ef50db20399145c1c2fd42505ac01e419a18959539379eeaf5b0a1860b44c576626896483e7371d396a3afc0a4760da0aa40cfc82dad2a4d02a15b043d2a7
+  data.tar.gz: b9ec8115fa1839dfa4f2f3187ce4abfd215678331d100c70b8e21b7e7fd25300d6a255f0e1c7228d34dc45def26001c1a6c81421bccde70f17ae6492c637aad3

data/README.md

@@ -42,22 +42,18 @@ GitCompound will also process manifests found in dependencies.
 
 ## Core features 
 
-GitCompound is more a distributed packaging system (dependency manager) than alternative to Git submodules,
-however it has common features of both Git submodules and dependency managers like Bundler or Composer.
+GitCompound has common features of both Git submodules and dependency managers like Bundler or Composer.
+It is a distributed dependency manager and alternative to Git submodules that gives you more flexibility.
 
-`GitCompound` makes sure your project composition is the same on all machines,
-but you can have different composition depending on manifest you are using.
-
-It has been created with Docker compatiblity in mind.
+It is particularly useful when you need to develop your project dependencies at the same time as project itself.
 
 Core features:
 
-*   `GitCompound` introduces Domain Specific Language desgined for writing manifests.
+*   GitCompound introduces Domain Specific Language desgined for writing manifests.
 
-*   It is possible to create multiple manifest files (`Compoundfile`, `.gitcompound` or something else)
-    and build them when necessary.
+*   Manifest file is used to specify dependencies of your project.
 
-*   Manifests can declare dependencies on different versions of components using different version strategies
+*   Manifest can declare dependencies on components using different version strategies
     (Rubygems-like version, tag, branch or explicit SHA).
 
 *   Manifests will be processed in hierarchical way. Manifest that `gitcompound` command is run against

data/lib/git_compound/builder.rb

@@ -18,7 +18,7 @@ module GitCompound
     def manifest_update
       Logger.info 'Updating components ...'
       @lock_new = Lock.new.clean
-      @manifest.process(Worker::ComponentUpdateDispatcher.new(@lock_new))
+      @manifest.process(Worker::ComponentDispatcher.new(@lock_new))
       self
     end
 
@@ -68,7 +68,7 @@ module GitCompound
 
     def locked_components_build
       Logger.info 'Building components from lockfile ...'
-      @lock.process(Worker::ComponentUpdateDispatcher.new(@lock))
+      @lock.process(Worker::ComponentDispatcher.new(@lock))
       self
     end
 

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

@@ -9,23 +9,25 @@ module GitCompound
           @sha = sha
         end
 
-        # If @sha matches ref in remote repository then
+        # If sha matches ref in remote repository then
         #   this ref should be returned
-        # else return @sha.
+        # else return sha.
         #
         def ref
           ref = @repository.refs.find { |refs_a| refs_a.include?(@sha) }
           ref ? ref.last : @sha
         end
 
-        def sha # rubocop:disable Style/TrivialAccessors
+        # rubocop:disable Style/TrivialAccessors
+        def sha
           @sha
         end
+        # rubocop:enable Style/TrivialAccessors
 
         def reachable?
-          # We assume that SHA is always available as we do not want
-          # to clone repository and check it -- this probably needs
-          # to be changed, so -- TODO
+          # TODO, we assume that SHA is always available as we do not want
+          # to clone repository and check if commit exists -- this probably
+          # needs to be changed when someone finds better solution for this.
           true
         end
 

data/lib/git_compound/component.rb

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

data/lib/git_compound/logger/debug/repository.rb

@@ -4,7 +4,10 @@ module GitCompound
     #
     class GitCommand
       extend Logger::Debugger
-      debug_before(:execute!) { "Running Git command `#{@command}`" }
+      debug_before(:execute!) do
+        "Running Git command `#{@command}`" +
+          (@workdir ? " in `#{@workdir.split(File::SEPARATOR).last}`" : '')
+      end
     end
   end
 end

data/lib/git_compound/repository/git_command.rb

@@ -8,13 +8,13 @@ module GitCompound
       attr_reader :output, :status, :command
 
       def initialize(cmd, args, workdir = nil)
-        @command = "(git #{cmd} #{args}) 2>&1"
+        @command = "git #{cmd} #{args}"
         @workdir = workdir
       end
 
       def execute!
         path = @workdir ? @workdir : Dir.pwd
-        Dir.chdir(path) { @output = `#{@command}` }
+        Dir.chdir(path) { @output = `(#{@command}) 2>&1` }
         @status = $CHILD_STATUS.exitstatus
         @output.sub!(/\n\Z/, '')
       end

data/lib/git_compound/repository/git_repository.rb

@@ -40,8 +40,8 @@ module GitCompound
         all
       end
 
-      def ref_exists?(ref)
-        matching = refs.select { |refs_a| refs_a.include?(ref.to_s) }
+      def branch?(branch)
+        matching = refs.select { |refs| refs.include?(branch.to_s) }
         matching.any?
       end
 

data/lib/git_compound/repository/repository_local.rb

@@ -8,7 +8,7 @@ module GitCompound
       def initialize(source)
         super
         @source = Pathname.new(@source).expand_path.to_s
-        raise RepositoryUnreachableError unless
+        raise RepositoryUnreachableError, "Invalid Git repository in #{@source}" unless
           File.directory?("#{@source}/.git")
       end
 

data/lib/git_compound/version.rb

@@ -1,5 +1,5 @@
 # GitCompound
 #
 module GitCompound
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/git_compound/worker/{component_update_dispatcher.rb → component_dispatcher.rb}

@@ -3,7 +3,7 @@ module GitCompound
     # Worker that decides whether component
     # should be built, updated or replaced
     #
-    class ComponentUpdateDispatcher < Worker
+    class ComponentDispatcher < Worker
       def initialize(lock)
         @lock    = lock
         @print   = PrettyPrint.new

data/lib/git_compound/worker/local_changes_guard.rb

@@ -9,6 +9,8 @@ module GitCompound
       end
 
       def visit_component(component)
+        return unless component.exists?
+
         @component  = component
         @repository = component.repository
 

data/lib/git_compound.rb

@@ -90,8 +90,8 @@ module GitCompound
              'git_compound/worker/circular_dependency_checker'
     autoload :ComponentBuilder,
              'git_compound/worker/component_builder'
-    autoload :ComponentUpdateDispatcher,
-             'git_compound/worker/component_update_dispatcher'
+    autoload :ComponentDispatcher,
+             'git_compound/worker/component_dispatcher'
     autoload :ComponentUpdater,
              'git_compound/worker/component_updater'
     autoload :ComponentReplacer,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_compound
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,8 +157,8 @@ files:
 - lib/git_compound/version.rb
 - lib/git_compound/worker/circular_dependency_checker.rb
 - lib/git_compound/worker/component_builder.rb
+- lib/git_compound/worker/component_dispatcher.rb
 - lib/git_compound/worker/component_replacer.rb
-- lib/git_compound/worker/component_update_dispatcher.rb
 - lib/git_compound/worker/component_updater.rb
 - lib/git_compound/worker/components_collector.rb
 - lib/git_compound/worker/conflicting_dependency_checker.rb