git_compound 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9364d9375f8d63441e365cf7ddcdbd841de74be3
-  data.tar.gz: 1f7d07c9aabc1626404e73dc6995749c952d48bc
+  metadata.gz: e127d67e2392d65dea06cf967be3770cba4144bc
+  data.tar.gz: 46dd79cde5f328dd213e7a072cf27b7b69b95fc6
 SHA512:
-  metadata.gz: f9455c25a7672dd3cff14035bddef0c697695a1378ce6e8f72bc40b4f6582113e9407a815b750d72bd09904bf18578191a39ffede8adeac79903ee84972980f3
-  data.tar.gz: 0911ffa0e74ec12bd5a1d97215eed5936d1e18a1ec3630fb9850ce171fba690a6cc101b7d869db146e6afbe85680b601528669811c8f9b8d751ebda1de5d6321
+  metadata.gz: 16e0fdc430743a2812def344af9efdae345886414853e0fe4f4566a51f3ff92828403d1c1921ee9d7413a1f6a106a6f3edd7adff96872f1dedad8054581569d8
+  data.tar.gz: d17fba0fdfc018cebfd5fe0c7fcad60e5d9a42c334c3e58f9b345cc45b32ab2e3a32e0bb69740305aec26519308d3d994e5a410ec00921c432e7c9d53edda598

data/README.md

@@ -4,10 +4,6 @@ Compose your project using git repositories and Ruby tasks.
 
 GitCompound combines features of Git submodules and common dependency managers like Bundler or Composer.
 
-## Status
-
-This project is in alpha phase
-
 ## Overview
 
 Create `Compoundfile` or `.gitcompound` manifest:
@@ -15,26 +11,26 @@ Create `Compoundfile` or `.gitcompound` manifest:
 ```ruby
   name :base_component
 
-  component :component_1 do
+  component :vendor_1 do
     version '~>1.1'
     source  'git@github.com:/user/repository'
     destination 'src/component_1'
   end
 
-  component :component_2 do
+  component :second_component do
     version '>=2.0'
     source  'git@github.com:/user/repository_2'
     destination 'src/component_2'
   end
 
-  component :component_3 do
+  component :my_component do
     branch 'feature/new-feature'
     source  '/my/component_3/repository'
     destination 'src/component_3'
   end
 
-  task 'add components to gitignore', :each do |component_dir|
-    File.open('.gitignore', 'a') { |f| f.write "#{component_dir}\n" }
+  task 'print details', :each do |_path, component|
+    puts "Component `#{component.name}` installed in #{component.path}"
   end
 ```
 
@@ -138,6 +134,10 @@ and name constraints
 
     *   `sha` -- use explicitly set commit **SHA**
 
+        If SHA points to HEAD of some existing  branch, this branch will be checked out instead of SHA.
+        This will prevent going into detached state. If SHA does not point to any HEAD of existing branch,
+        component destination repository will be left in detached state.
+
 4.  Provide path to **source** repository using `source` method of manifest domain specific language.
 
     It will be used as source to clone repository into destination directory.

data/lib/git_compound/component.rb

@@ -6,7 +6,7 @@ module GitCompound
   #
   class Component < Node
     extend Forwardable
-    delegate [:sha, :ref, :origin, :repository, :version] => :@source
+    delegate [:sha, :ref, :origin, :version] => :@source
     delegate [:path, :exists?, :repository] => :@destination
 
     attr_reader :name
@@ -44,7 +44,7 @@ module GitCompound
       @destination.repository do |repo|
         repo.fetch
         repo.checkout(@source.ref)
-        repo.merge
+        repo.merge if repo.branches.include?(@source.ref)
       end
     end
 

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

@@ -9,8 +9,13 @@ module GitCompound
           @sha = sha
         end
 
+        # If @sha matches ref in remote repository then
+        #   this ref should be returned
+        # else return @sha.
+        #
         def ref
-          @sha
+          ref = @repository.refs.find { |refs_a| refs_a.include?(@sha) }
+          ref ? ref.last : @sha
         end
 
         def sha # rubocop:disable Style/TrivialAccessors

data/lib/git_compound/repository/repository_local.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module GitCompound
   module Repository
     # Local git repository implementation
@@ -5,8 +7,9 @@ module GitCompound
     class RepositoryLocal < GitRepository
       def initialize(source)
         super
+        @source = Pathname.new(@source).expand_path.to_s
         raise RepositoryUnreachableError unless
-        File.directory?("#{@source}/.git")
+          File.directory?("#{@source}/.git")
       end
 
       def clone(destination, options = nil)

data/lib/git_compound/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_compound
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler