mgmt 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f2f2cff1dc34a1c4d37b606104527601ca9042
-  data.tar.gz: 20f47572148e83d7ff478ac99479a42660d24551
+  metadata.gz: e0dca341a6b2e3e10a68e4801180d0ccffa6765c
+  data.tar.gz: d49f1de8ae327fc31b5ad1c521ea4c341ff7ff82
 SHA512:
-  metadata.gz: 9ae773b0085436a2e90eadaebf37127fd886d7f48446af9ad7b39fa18a0a57721d9cbace6bec6cb121fda000dccf3e7dda8c91267b42eecde886640fb12a7d61
-  data.tar.gz: acd0d1c66635dd41fed5326ce2ec950e8467a3623415519c6f9468ce15234ecc332259618fb119b4d79d3e1095095585f8d6bf33f5197aa160b43b3113260118
+  metadata.gz: cf018f3223b6f6ebde93cfcb515aa7e1022b57c4e8d890366baabb7fa8c984cfcb89fc0255208c1e49a6266e7aa0502d129ac5a822df9eb84c3a8da678c05480
+  data.tar.gz: d2c5a7a62dd93fd5ce5ae3e690bb20294e6e87833b19385516722d57a382740b65f19964b989db7ff08853816c9c4f7c918f093b66542d1a8732ccfc77328e82

data/bin/mgmt

@@ -9,7 +9,7 @@ module MGMT
   DEPSFILE = "Gopherfile"
   LOCKFILE = "Gopherfile.lock"
   VENDOR   = ".vendor"
-  VERSION  = "0.2.4"
+  VERSION  = "0.3.0"
 
   def xputs(code, msg)
     code = nil if ENV['TERM'] != "xterm"
@@ -23,6 +23,12 @@ module MGMT
     system(cmd) || abort("Failed to execute command: #{cmd}")
   end
 
+  def shv(cmd)
+    value = `#{cmd}`
+    abort "Failed to execute command: #{cmd}" unless $?.success?
+    value.strip
+  end
+
   def abort(msg)
     xputs "31", ">>> #{msg}"
     Kernel.exit(1)
@@ -31,8 +37,8 @@ module MGMT
   def read
     abort "#{DEPSFILE} not found" unless File.exist?(DEPSFILE)
 
-    deps = Deps.parse(DEPSFILE)
-    deps.merge! Deps.parse(LOCKFILE) if File.exist?(LOCKFILE)
+    deps = Deps.parse(DEPSFILE, :tag)
+    deps.merge! Deps.parse(LOCKFILE, :rev) if File.exist?(LOCKFILE)
     deps
   end
 
@@ -40,11 +46,24 @@ module MGMT
     deps.each do |dep|
       MGMT.xputs "33",  "### #{dep.name}"
       if dep.pull!
-        MGMT.xputs nil, "    now at ##{dep.tag}"
+        MGMT.xputs nil, "    now at ##{dep.version}"
       end
     end
   end
 
+  def update(deps, updates)
+    versions = {}
+    updates.each do |str|
+      name, rev = str.split("#", 2)
+      versions[name] = rev
+    end
+    deps.select do |dep|
+      versions.include?(dep.name)
+    end.each do |dep|
+      dep.rev = versions[dep.name]
+    end
+  end
+
   def lock(deps)
     deps.lock!
     MGMT.xputs "32", "=== #{LOCKFILE} written"
@@ -52,15 +71,15 @@ module MGMT
 
   def exec(*c)
     ENV['GOPATH'] = "#{File.expand_path(VENDOR, ".")}:#{ENV['GOPATH']}"
-    Kernel.exec *c
+    Kernel.exec(*c)
   end
 
   class Deps < Array
 
-    def self.parse(file)
+    def self.parse(file, field)
       deps = []
       File.read(file).each_line do |line|
-        deps.push Dep.parse(line)
+        deps.push Dep.parse(line, field)
       end
       new deps.compact
     end
@@ -69,28 +88,20 @@ module MGMT
       detect {|i| i.name == name }
     end
 
-    def filter(names)
-      self.class.new select {|i| names.include?(i.name) }
-    end
-
-    def reset!
-      each do |dep|
-        dep.tag = nil
-      end
+    def select
+      self.class.new(super)
     end
 
     def merge!(locked)
       each do |dep|
-        next if dep.tag
-
-        match = locked.find(dep.name)
-        dep.tag = match.tag if match
+        match   = locked.find(dep.name)
+        dep.rev = match.rev if match
       end
     end
 
     def lock!
       temp = Tempfile.new LOCKFILE
-      each {|d| temp.puts d.to_s }
+      each {|dep| temp.puts dep.to_s }
       temp.close
       FileUtils.mv temp.path, LOCKFILE
     end
@@ -99,7 +110,7 @@ module MGMT
 
   class Dep
 
-    def self.parse(line)
+    def self.parse(line, field)
       line   = line.strip
       return if line[0] == "#"
 
@@ -112,18 +123,19 @@ module MGMT
         when "!", 33
           opts[:repo] = token[1..-1]
         when "#", 35
-          opts[:tag]  = token[1..-1]
+          opts[field] = token[1..-1]
         end
       end
       new tokens[0], opts
     end
 
     attr_reader   :name, :repo
-    attr_accessor :tag
+    attr_accessor :tag, :rev
 
     def initialize(name, opts = {})
       @name = name
-      @tag  = opts[:tag]
+      @tag  = opts[:tag] # Specified tag
+      @rev  = opts[:rev] # Locked rev
       @repo = opts[:repo] || "http://#{name}"
     end
 
@@ -131,22 +143,29 @@ module MGMT
       @target ||= File.join(VENDOR, 'src', @name)
     end
 
+    def version
+      @rev || @tag || 'master'
+    end
+
     def pull!
-      skip = false
-      if File.directory?(target)
-        skip = @tag && @tag == `cd #{target} && git --git-dir=.git log -n 1 --pretty=format:'%h'`.strip
-        MGMT.sh "cd #{target} && git --git-dir=.git fetch -q --all" unless skip
-      else
+      current = MGMT.shv("cd #{target} && git --git-dir=.git log -n 1 --pretty=format:'%h'") if File.directory?(target)
+      return false if current && current == rev
+
+      if current.nil?
         MGMT.sh "git clone -q #{@repo} #{target}"
+      else
+        MGMT.sh "cd #{target} && git --git-dir=.git fetch -q origin"
       end
 
-      @tag ||= `cd #{target} && git --git-dir=.git log -n 1 --pretty=format:'%h'`.strip
-      MGMT.sh "cd #{target} && git --git-dir=.git reset -q --hard #{@tag}" unless skip
-      !skip
+      remote = "origin/#{version}"
+      @rev = MGMT.shv "cd #{target} && git --git-dir=.git show-ref -q #{remote} && git --git-dir=.git rev-parse --short #{remote} || git --git-dir=.git rev-parse --short #{version}"
+
+      MGMT.sh "cd #{target} && git --git-dir=.git reset -q --hard #{rev}"
+      true
     end
 
     def to_s
-      "#{@name} ##{@tag} !#{@repo}"
+      "#{@name} ##{version} !#{@repo}"
     end
   end
 end
@@ -162,9 +181,8 @@ when "go"
   MGMT.exec "go", *ARGV
 when "update"
   deps = MGMT.read
-  some = deps.filter(ARGV)
+  some = MGMT.update(deps, ARGV)
   unless some.empty?
-    some.reset!
     MGMT.pull(some)
     MGMT.lock(deps)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgmt
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -57,8 +57,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: a minimalistic, self-contained, massively opinionated dependency manager
 test_files: []
+has_rdoc: