autobuild 1.10.1 → 1.11.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6def4ec61d33b39f6ba2e362dc2e270058f781eb
-  data.tar.gz: 34de65f94cbd2e135f096617028cee2aed60954f
+  metadata.gz: 5abb3c21cd7451fd077c26272e062ee8cee4de51
+  data.tar.gz: 6d10760392b3106e23f3b24a4bf338dcd9194974
 SHA512:
-  metadata.gz: b0fc25e4c12d1fcb224f4cfc2e74cab62810a4be013841a723b41b3a200d7cd7c2931407eb1eba671e646094a0a6aaf6bc3b14d73c0e3352c7d3f19607de5f51
-  data.tar.gz: 9807abd7fe4c1373065dc1157221274d4b305aa192c2ab9323f8a9113f365ab84823fd52eed6cf2554cdc0c47fedf092939fb4990117972b5e0de4a4e3785ba1
+  metadata.gz: a600aca31f49d9336974cbf53b2ae81f9eae74966abee18093ada14a8e04c25da6302b7f990830ed32535ea41252b376b551bfe8b58aa3f7b401d045fe25eb41
+  data.tar.gz: f319f3b540cd9939a0dff6c8bc69f1f356b7fc0fd8c23dfedd3833250bb3b7741c953e15227ff8cca5bc85e045dc1babea7c3a96776675c478b6133862b145cc

data/autobuild.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
     s.extensions = []
     s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
-    s.add_runtime_dependency "rake", ">= 11.1.0", '~> 11.1'
-    s.add_runtime_dependency "utilrb", ">= 3.0"
-    s.add_runtime_dependency 'tty-prompt', '>= 0.6.0', '~> 0.6.0'
-    s.add_runtime_dependency 'pastel', '>= 0.6.0', '~> 0.6.0'
-    s.add_development_dependency "flexmock", ">= 2.0.0"
-    s.add_development_dependency "minitest", ">= 5.0", "~> 5.0"
+    s.add_runtime_dependency "rake", "~> 12.0", ">= 12.0.0"
+    s.add_runtime_dependency "utilrb", "~> 3.0", ">= 3.0"
+    s.add_runtime_dependency 'tty-prompt', '~> 0.12.0', '>= 0.12.0'
+    s.add_runtime_dependency 'pastel', '~> 0.7.0', '>= 0.7.0'
+    s.add_development_dependency "flexmock", '~> 2.0', ">= 2.0.0"
+    s.add_development_dependency "minitest", "~> 5.0", ">= 5.0"
     s.add_development_dependency "fakefs"
     s.add_development_dependency "simplecov"
 end

data/lib/autobuild/import/git.rb

@@ -374,7 +374,7 @@ def delta_between_tags(package, from_tag, to_tag)
         # @return [Hash<String,String>] a mapping from a tag name to its commit
         #   ID
         def tags(package, options = Hash.new)
-            if !options.fetch(only_local: false)
+            if !options.fetch(:only_local, false)
                 run_git_bare(package, 'fetch', '--tags')
             end
             tag_list = run_git_bare(package, 'show-ref', '--tags').map(&:strip)
@@ -612,8 +612,9 @@ def status(package, options = Hash.new)
             end
 
             validate_importdir(package)
-            remote_commit = current_remote_commit(package, only_local)
-            status = merge_status(package, remote_commit)
+            pinned_state, target_commit, _ = determine_target_state(package, only_local: only_local)
+
+            status = merge_status(package, target_commit)
             status.uncommitted_code = self.class.has_uncommitted_changes?(package)
             if current_branch = self.current_branch(package)
                 if current_branch != "refs/heads/#{local_branch}"
@@ -957,18 +958,7 @@ def reset_head_to_commit(package, target_commit, fetch_commit, options = Hash.ne
             end
         end
 
-        # @option (see Package#update)
-        def update(package, options = Hash.new)
-            validate_importdir(package)
-            only_local = options.fetch(:only_local, false)
-            reset = options.fetch(:reset, false)
-            
-            # This is really really a hack to workaround how broken the
-            # importdir thing is
-            if package.importdir == package.srcdir
-                update_alternates(package)
-            end
-
+        def determine_target_state(package, only_local: false)
             pinned_state =
                 if commit then commit
                 elsif tag then "refs/tags/#{tag}"
@@ -987,6 +977,25 @@ def update(package, options = Hash.new)
                     current_remote_commit(package, only_local: only_local)
             end
 
+            return pinned_state, target_commit, fetch_commit
+        end
+
+
+        # @option (see Package#update)
+        def update(package, options = Hash.new)
+            validate_importdir(package)
+            only_local = options.fetch(:only_local, false)
+            reset = options.fetch(:reset, false)
+            
+            # This is really really a hack to workaround how broken the
+            # importdir thing is
+            if package.importdir == package.srcdir
+                update_alternates(package)
+            end
+
+            pinned_state, target_commit, fetch_commit =
+                determine_target_state(package, only_local: only_local)
+
             # If we are tracking a commit/tag, just check it out and return
             if !has_local_branch?(package)
                 package.message "%%s: checking out branch %s" % [local_branch]

data/lib/autobuild/package.rb

@@ -275,7 +275,7 @@ def apply_env(env, set = Hash.new, ops = Array.new)
                     if last = set[env_op.name]
                         last_pkg, last_values = *last
                         if last_values != env_op.values
-                            raise IncompatibleEnvironment, "trying to reset #{env_op.name} to #{env_op.values} which conflicts with #{last_pkg.name} already setting it to #{last_values}"
+                            raise IncompatibleEnvironment, "trying to reset #{env_op.name} to #{env_op.values} in #{self.name} but this conflicts with #{last_pkg.name} already setting it to #{last_values}"
                         end
                     else
                         set[env_op.name] = [self, env_op.values]

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.10.1" unless defined? Autobuild::VERSION
+    VERSION = "1.11.0.rc1" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,39 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0.rc1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: utilrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -41,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -48,46 +54,49 @@ dependencies:
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.12.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.12.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -95,6 +104,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -102,20 +114,20 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -219,9 +231,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -229,3 +241,4 @@ signing_key:
 specification_version: 4
 summary: Library to handle build systems and import mechanisms
 test_files: []
+has_rdoc: