mgmt 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e103fcf077abbf15b8784d6c6d47b87db93bf3
-  data.tar.gz: 0d8b56f06cb0f6a50fea05ed2f820f94768af911
+  metadata.gz: 7adf2734177f622d4711cc2a90f26f92898602d5
+  data.tar.gz: c7d6a1dd4ff154f9055e9a07c333a1139a13104b
 SHA512:
-  metadata.gz: 06823b066d6431ac9aba4ef1e2009e09afc6e119c55349873ef56848cacc1ad7aaff10422b4c98f0689b2f741f9b80b140ba9743ee85945bc2789564e4bc04ab
-  data.tar.gz: 9ce5bf48a57b8ade6de9d7497b469e71f9477a4bfe0d44f7b93138105a6d4dbe373e691942507fa06eafee03d32418c3d7a50b3cda6adda006068be7205f8de9
+  metadata.gz: 919ab5c1cb32720fa26146755f220c451c6f81e8a821e2625394057850594c1e66c7ace1e88fc87ceeb710c29253a21417f44ad3ba87765adc9777751c7e1276
+  data.tar.gz: c02e3fd6a966e9215136badabe68d7bff67daf0cadcef858f710d98f7918499262fa315659ee22b1f22e4cda5fc1e62a2caf73a709484517237e6ec9b78a9ec3

data/bin/mgmt

@@ -9,7 +9,7 @@ module MGMT
   DEPSFILE = "Gopherfile"
   LOCKFILE = "Gopherfile.lock"
   VENDOR   = ".vendor"
-  VERSION  = "0.2.0"
+  VERSION  = "0.2.1"
 
   def xputs(code, msg)
     code = nil if ENV['TERM'] != "xterm"
@@ -24,57 +24,100 @@ module MGMT
   end
 
   def abort(msg)
-    xputs "31;1", ">>>> #{msg}"
+    xputs "31", ">>> #{msg}"
     Kernel.exit(1)
   end
 
+  def read
+    abort "#{DEPSFILE} not found" unless File.exist?(DEPSFILE)
+
+    deps = Deps.parse(DEPSFILE)
+    deps.merge! Deps.parse(LOCKFILE) if File.exist?(LOCKFILE)
+    deps
+  end
+
   def pull(deps)
     deps.each do |dep|
-      xputs "33;1", "---> #{dep.name}"
-      dep.pull!
+      MGMT.xputs "33",  "### #{dep.name}"
+      if dep.pull!
+        MGMT.xputs nil, "    now at ##{dep.tag}"
+      end
     end
   end
 
-  def read_deps
-    source = File.exist?(LOCKFILE) ? LOCKFILE : DEPSFILE
-    abort "#{source} not found" unless File.exist?(source)
-
-    File.read(source).each_line.map {|ln| parse(ln) }.compact
+  def lock(deps)
+    deps.lock!
+    MGMT.xputs "32", "=== #{LOCKFILE} written"
   end
 
-  def write_lockfile(deps)
-    temp = Tempfile.new LOCKFILE
-    deps.each {|d| temp.puts d.to_s }
-    temp.close
-    FileUtils.mv temp.path, LOCKFILE
-    xputs "32", "==== #{LOCKFILE} written"
+  def exec(*c)
+    ENV['GOPATH'] = "#{File.expand_path(VENDOR, ".")}:#{ENV['GOPATH']}"
+    Kernel.exec *c
   end
 
-  def parse(line)
-    line   = line.strip
-    return if line[0] == "#"
+  class Deps < Array
+
+    def self.parse(file)
+      deps = []
+      File.read(file).each_line do |line|
+        deps.push Dep.parse(line)
+      end
+      new deps.compact
+    end
+
+    def find(name)
+      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
+    end
 
-    tokens = line.split(/ +/)
-    return if tokens.empty?
+    def merge!(locked)
+      each do |dep|
+        next if dep.tag
 
-    opts = {}
-    tokens[1..-1].each do |token|
-      case token[0]
-      when "!", 33
-        opts[:repo] = token[1..-1]
-      when "#", 35
-        opts[:tag]  = token[1..-1]
+        match = locked.find(dep.name)
+        dep.tag = match.tag if match
       end
     end
-    Dep.new tokens[0], opts
-  end
 
-  def exec(*c)
-    ENV['GOPATH'] = "#{File.expand_path(VENDOR, ".")}:#{ENV['GOPATH']}"
-    Kernel.exec *c
+    def lock!
+      temp = Tempfile.new LOCKFILE
+      each {|d| temp.puts d.to_s }
+      temp.close
+      FileUtils.mv temp.path, LOCKFILE
+    end
+
   end
 
   class Dep
+
+    def self.parse(line)
+      line   = line.strip
+      return if line[0] == "#"
+
+      tokens = line.split(/ +/)
+      return if tokens.empty?
+
+      opts = {}
+      tokens[1..-1].each do |token|
+        case token[0]
+        when "!", 33
+          opts[:repo] = token[1..-1]
+        when "#", 35
+          opts[:tag]  = token[1..-1]
+        end
+      end
+      new tokens[0], opts
+    end
+
     attr_reader   :name, :repo
     attr_accessor :tag
 
@@ -89,14 +132,17 @@ module MGMT
     end
 
     def pull!
+      skip = false
       if File.directory?(target)
-        MGMT.sh "git -C #{target} pull -q origin master"
+        skip = @tag && @tag == `git -C #{target} log -n 1 --pretty=format:'%h'`.strip
+        MGMT.sh "git -C #{target} pull -q origin master" unless skip
       else
-        MGMT.sh "git clone #{@repo} #{target}"
+        MGMT.sh "git clone -q #{@repo} #{target}"
       end
 
       @tag ||= `git -C #{target} log -n 1 --pretty=format:'%h'`.strip
-      MGMT.sh "git -C #{target} reset --hard #{@tag}"
+      MGMT.sh "git -C #{target} reset -q --hard #{@tag}" unless skip
+      !skip
     end
 
     def to_s
@@ -109,18 +155,18 @@ end
 
 case ARGV.shift
 when "install", nil
-  deps = MGMT.read_deps
+  deps = MGMT.read
   MGMT.pull(deps)
-  MGMT.write_lockfile(deps)
+  MGMT.lock(deps)
 when "go"
   MGMT.exec "go", *ARGV
 when "update"
-  deps = MGMT.read_deps
-  some = deps.select {|d| ARGV.include?(d.name) }
+  deps = MGMT.read
+  some = deps.filter(ARGV)
   unless some.empty?
-    some.each {|d| d.tag = nil }
+    some.reset!
     MGMT.pull(some)
-    MGMT.write_lockfile(deps)
+    MGMT.lock(deps)
   end
 when "version"
   puts MGMT::VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgmt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake