gitan 0.0.1 → 0.0.2

data/CHANGES

@@ -1,8 +1,21 @@
 = Gitan changelog
 
+== Master for 0.0.3
+
+== Version 0.0.2
+* Bugfix of to_be_pushed; to be false just after git pull.
+* add bin/gitan
+* add gitan subcommand, gitan status, alternatively to bin/gitanstatus
+* add gitan subcommand, gitan heads
+* add gitan subcommand, gitan commit
+* add gitan subcommand, gitan push
+* add gitan subcommand, gitan pull
+* add --remote option to 'gitan status'
+* add --all and --explain options to gitan status
+
 == Version 0.0.1
-* Small bugfix for executable bin/gitanstatus
+* small bugfix for executable bin/gitanstatus
 
 == Version 0.0.0
-* Add Gitan::Repo
-* Add bin/gitanstatus
+* add Gitan::Repo
+* add bin/gitanstatus

data/README.rdoc

@@ -1,6 +1,23 @@
 = gitan
 
-Description goes here.
+This gem provides some commands to manage multiple git repositories.
+'gitan status' shows status of every git repository.
+  - multiple branch?
+  - changes to be staged?
+  - changes to be commited?
+  - changes to be pushed?
+  - updates on remote repository? (when --remote option is used)
+
+'gitan commit' commits on all git repositories that has changes to be commited.
+'gitan push' pushes on all git repositories that has changes to be pushed.
+'gitan pull' pulles on all git repositories that has updates on remote repository.
+The repositories that have no changes are ignored.
+
+== Installation
+If you want to use --remote options, install gitan at remote host and enable to execute 'gitan heads'.
+
+== Usage
+Execute 'gitan --help'.
 
 == Contributing to gitan
  

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/gitan

@@ -0,0 +1,165 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+#gitan heads
+# Show hash value of every git repository.
+#
+#gitan status
+# Show status of every git working trees.
+# Confirm the command 'git rev-parse FETCH_HEAD' show a hash value.
+# If not, you should execute 'git pull'
+#
+#gitan commit
+# Commit every working tree that has changes to be be commited.
+#
+#gitan push
+# Commit every working tree that has changes to be pushed.
+#
+#gitan pull
+# Pull every working tree that has update on remote.
+
+require "optparse"
+require "yaml"
+require "pp"
+require "gitan"
+
+def show_usage
+  puts <<-HERE
+USAGE
+  gitan heads  [path]"
+  gitan status [path] [-r remote_dir]"
+  gitan commit [path] [-a arguments]"
+  gitan push   [path] [-a arguments]"
+  gitan pull   [path] [-a arguments] [-r remote_dir]"
+
+  Default value of 'path' is ~/git.
+
+  Examples:
+    gitan heads /home/git
+    gitan status -r example.com:/home/git
+    gitan commit --argument='-am "commit message"'
+    gitan push -a "origin master"
+    gitan pull ~/git -r example.com:/home/git -a "origin master"
+  HERE
+end
+
+def add_remote_option
+  OPTION_PARSER.on("-r remote_dir", "--remote=dir", "with remote info"){ |remote_dir|
+    server, path = remote_dir.split(":")
+    OPTIONS[:remote] = Gitan.remote_heads(server, path)
+  }
+end
+
+def add_argument_option
+  OPTION_PARSER.on("-a str", "--arguments=str", "supply argument to command"){ |str|
+    OPTIONS[:argument] = str
+  }
+end
+
+def repositories(remote_heads = {})
+  git_dir = ENV["HOME"] + "/git"
+  git_dir = File::expand_path(ARGV[0]) if ARGV[0]
+
+
+  dirs = Dir.glob(git_dir + "/*").sort.map do |path|
+    if File.directory? path
+      remote_head = nil
+      remote_head = OPTIONS[:remote][File.basename(path)] if OPTIONS[:remote]
+      Gitan::Repo.new(path, remote_head)
+    else
+      nil
+    end
+  end
+  dirs.select{|dir| dir}
+end
+
+def execute(path, command)
+  print "#{path}: "
+  Dir.chdir path
+  puts command
+  system command unless OPTIONS[:debug]
+end
+
+def status
+  add_remote_option
+  OPTION_PARSER.on("-a", "--all", "show all repositories."){ OPTIONS[:all] = true}
+  OPTION_PARSER.on("-e", "--explain", "show explanation for abbreviation."){ OPTIONS[:explain] = true}
+  OPTION_PARSER.parse!(ARGV)
+
+  repos = repositories
+  unless OPTIONS[:all]
+    repos = repos.select do |repo|
+      result = false
+      result = true if repo.multiple_branch?
+      result = true if repo.to_be_staged?
+      result = true if repo.to_be_commited?
+      result = true if repo.to_be_pushed?
+      result = true if (OPTIONS[:remote] && repo.to_be_pulled?)
+      result
+    end
+  end
+
+  Gitan::Repo.show_abbreviation if OPTIONS[:explain]
+  repos.each do |repo|
+    puts repo.short_status
+  end
+end
+
+def heads
+  results = {}
+  repositories.each do |repo|
+    results[repo.path] = repo.head
+  end
+  YAML.dump(results, $stdout)
+end
+
+def commit
+  add_argument_option
+  OPTION_PARSER.parse!(ARGV)
+  repositories.select {|repo| repo.to_be_commited?}.each do |repo|
+    execute(repo.path, "git commit #{OPTIONS[:argument]}")
+  end
+end
+
+def push
+  add_argument_option
+  OPTION_PARSER.parse!(ARGV)
+
+  repositories.select {|repo| repo.to_be_pushed?}.each do |repo|
+    execute(repo.path, "git push #{OPTIONS[:argument]}")
+  end
+end
+
+def pull
+  add_remote_option
+  add_argument_option
+  OPTION_PARSER.parse!(ARGV)
+
+  repositories.select {|repo| repo.to_be_pulled?}.each do |repo|
+    execute(repo.path, "git pull #{OPTIONS[:argument]}")
+  end
+end
+
+##main
+OPTIONS = {}
+OPTION_PARSER = OptionParser.new
+OPTION_PARSER.on("-d", "--debug", "debug mode."){OPTIONS[:debug] = true}
+command = ARGV.shift
+
+case command
+when "status"
+  status
+when "heads"
+  heads
+when "commit"
+  commit
+when "push"
+  push
+when "pull"
+  pull
+when "--help"
+  show_usage
+else
+  puts "Unknown command: #{command}"
+  show_usage
+end

data/gitan.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "gitan"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
-  s.date = "2013-09-05"
+  s.date = "2013-09-09"
   s.description = "This gem provides some commands to manage multiple git repositories."
   s.email = "ippei94da@gmail.com"
-  s.executables = ["gitanstatus"]
+  s.executables = ["gitan"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "bin/gitanstatus",
+    "bin/gitan",
     "gitan.gemspec",
     "lib/gitan.rb",
     "lib/gitan/repo.rb",

data/lib/gitan/repo.rb

@@ -1,12 +1,21 @@
 #
 class Gitan::Repo
+  attr_reader :path
 
   def self.show_abbreviation(io = $stdout)
-    io.puts "==== B: multiple branches, S: to be staged, C: to be commited, P: to be pushed."
+    #io.puts "==== B: multiple branches, S: to be staged, C: to be commited, P: to be pushed, L: to be pulled."
+    io.puts "Abbreviations:"
+    io.puts "  L: to be pulled."
+    io.puts "  B: multiple branches"
+    io.puts "  S: to be staged"
+    io.puts "  C: to be commited"
+    io.puts "  P: to be pushed"
+    io.puts "========================================"
   end
 
-  def initialize(path)
+  def initialize(path, remote_head = false)
     @path = path
+    @remote_head = remote_head
   end
 
   #Return short status as String. E.g,
@@ -17,6 +26,9 @@ class Gitan::Repo
   # C: to be commited
   # P: to be pushed
   def short_status
+    l = " "
+    l = "L" if @remote_head && to_be_pulled?
+
     b = " "
     b = "B" if multiple_branch?
 
@@ -29,7 +41,7 @@ class Gitan::Repo
     p = " "
     p = "P" if to_be_pushed?
 
-    return (b + s + c + p + " " + @path)
+    return (l + b + s + c + p  + " " + File.basename(@path))
   end
 
   def multiple_branch?
@@ -39,28 +51,45 @@ class Gitan::Repo
 
   #Return true if working tree has untracked changes.
   def to_be_staged?
-    lines = command_output_lines("git status -s")
-    return lines.select {|line| line =~ /^\?\?/} != []
+    lines = command_output_lines("git status --porcelain")
+    result = false
+    lines.each do |line|
+      result = true if line =~ /^\?\? /
+      result = true if line =~ /^ . /
+    end
+    return result
   end
 
   #Return true if working tree has changes on stage index.
   def to_be_commited?
-    lines = command_output_lines("git status -s")
+    lines = command_output_lines("git status --porcelain")
     return lines.select {|line| line =~ /^[^\?]/} != []
   end
 
   #Return true if working tree has change which is commited but not pushed.
   def to_be_pushed?
-    head = command_output_lines("git rev-parse HEAD")[0]
+    result = true
+
     remote_lines = command_output_lines("git rev-parse --remotes")
-    return (! remote_lines.include?(head))
+    result = false if remote_lines.include?(head)
+
+    fetch_head = command_output_lines("git rev-parse FETCH_HEAD")[0]
+    result = false if head == fetch_head
+
+    return result
   end
 
-  private
+  def head
+    command_output_lines("git rev-parse HEAD")[0]
+  end
+
+  #Return true if the working tree has un-pulled changes on remote.
+  def to_be_pulled?
+    lines = command_output_lines('git log --pretty=format:"%H"')
+    return ! lines.include?(@remote_head)
+  end
 
-  #def short_status_lines
-  #  `git status -s`.split("\n")
-  #end
+  private
 
   def command_output_lines(str)
     Dir.chdir @path

data/lib/gitan.rb

@@ -1,5 +1,19 @@
 module Gitan; end
 
 require "pp"
+require "yaml"
 #require "grit"
 require "gitan/repo.rb"
+
+module Gitan
+
+  #Return heads in remote host.
+  def self.remote_heads(server, path)
+    results = {}
+    YAML.load(`ssh #{server} gitan heads #{path}`).each do |repo_path, head|
+      repo_name = File.basename(repo_path).sub(/\.git$/, "")
+      results[repo_name] = head
+    end
+    return results
+  end
+end

data/test/gitan/test_repo.rb

@@ -2,14 +2,7 @@ gem "test-unit"
 require "test/unit"
 require "gitan"
 
-
-#class GritRepoDummy
-#  attr_accessor :status
-#  def initialize(status)
-#    @status = status
-#  end
-#end
-#
+#class GritRepoDummy #  attr_accessor :status #  def initialize(status) #    @status = status #  end #end #
 #class GritRepoStatusDummy
 #  attr_accessor :changed
 #  attr_accessor :added
@@ -44,85 +37,137 @@ class TestRepo < Test::Unit::TestCase
   def setup
     outputs = {
       "git branch" => ["* master"],
-      "git status -s" => [],
-      "git rev-parse HEAD" => ["b4a9cab36b51cc8ca9b9a67d4b7c82abf6f02df4"],
+      "git status --porcelain" => [],
+      "git rev-parse HEAD" => ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"],
+      "git rev-parse FETCH_HEAD" => ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"],
       "git rev-parse --remotes" => [
-        "b4a9cab36b51cc8ca9b9a67d4b7c82abf6f02df4",
-        "d37ebd5948c87c142cf52572c44f032896879ec9",
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
       ],
     }
-    @r00 = Gitan::Repo.new("r00")
+    @r00 = Gitan::Repo.new("/home/git/r00")
     @r00.set_outputs(outputs)
 
     outputs = {
       "git branch" => ["* master", "  tmp"],
-      "git status -s" => [
+      "git status --porcelain" => [
         " M Gemfile",
         "AM bin/gitanstatus",
         "?? test/gitan/",
       ],
-      "git rev-parse HEAD" => ["b4a9cab36b51cc8ca9b9a67d4b7c82abf6f02df4"],
+      "git rev-parse HEAD" => ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"],
+      "git rev-parse FETCH_HEAD" => ["dddddddddddddddddddddddddddddddddddddddd"],
       "git rev-parse --remotes" => [
-        "6671b434a3ed6414cab0c676a90c575bbb03d9da",
-        "d37ebd5948c87c142cf52572c44f032896879ec9",
+        "cccccccccccccccccccccccccccccccccccccccc",
+        "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
       ],
     }
-    @r01 = Gitan::Repo.new("r01")
+    @r01 = Gitan::Repo.new("/home/git/r01")
     @r01.set_outputs(outputs)
 
     outputs = {
       "git branch" => ["* master", "  tmp"],
-      "git status -s" => [
+      "git status --porcelain" => [
         "?? test/gitan/",
       ],
-      "git rev-parse HEAD" => ["b4a9cab36b51cc8ca9b9a67d4b7c82abf6f02df4"],
+      "git rev-parse HEAD" => ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"],
+      "git rev-parse FETCH_HEAD" => ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"],
       "git rev-parse --remotes" => [
-        "6671b434a3ed6414cab0c676a90c575bbb03d9da",
-        "b4a9cab36b51cc8ca9b9a67d4b7c82abf6f02df4",
+        "cccccccccccccccccccccccccccccccccccccccc",
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
       ],
     }
-    @r02 = Gitan::Repo.new("r02")
+    @r02 = Gitan::Repo.new("/home/git/r02")
     @r02.set_outputs(outputs)
 
     outputs = {
       "git branch" => ["* master"],
-      "git status -s" => [],
-      "git rev-parse HEAD" => ["b4a9cab36b51cc8ca9b9a67d4b7c82abf6f02df4"],
+      "git status --porcelain" => [],
+      "git rev-parse HEAD" => ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"],
+      "git rev-parse FETCH_HEAD" => ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"],
       "git rev-parse --remotes" => [
-        "b4a9cab36b51cc8ca9b9a67d4b7c82abf6f02df4",
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
       ],
     }
-    @r03 = Gitan::Repo.new("r00")
+    @r03 = Gitan::Repo.new("/home/git/r00")
     @r03.set_outputs(outputs)
 
+    outputs = {
+      "git branch" => ["* master"],
+      "git status --porcelain" => [],
+      "git rev-parse HEAD" => ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"],
+      "git rev-parse FETCH_HEAD" => ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"],
+      "git rev-parse --remotes" => [
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+      ],
+      'git log --pretty=format:"%H"' => [
+        'eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+        'ffffffffffffffffffffffffffffffffffffffff',
+        '0000000000000000000000000000000000000000',
+      ]
+    }
+    @r04 = Gitan::Repo.new("/home/git/r04","aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
+    @r04.set_outputs(outputs)
+
+    @r05 = Gitan::Repo.new("/home/git/r05","eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee")
+    @r05.set_outputs(outputs)
+
+    outputs = {
+      "git branch" => ["* master", "  tmp"],
+      "git status --porcelain" => [
+        " M Gemfile",
+        "AM bin/gitanstatus",
+        "?? test/gitan/",
+      ],
+      "git rev-parse HEAD" => ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"],
+      "git rev-parse FETCH_HEAD" => ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"],
+      "git rev-parse --remotes" => [
+        "cccccccccccccccccccccccccccccccccccccccc",
+        "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+      ],
+    }
+    @r06 = Gitan::Repo.new("/home/git/r01")
+    @r06.set_outputs(outputs)
+
   end
 
   def test_to_be_staged?
     assert_equal(false, @r00.to_be_staged?)
     assert_equal(true , @r01.to_be_staged?)
 
-    @r00.outputs["git status -s"] = [
-        "?? test/gitan/",
-    ]
+    @r00.outputs["git status --porcelain"] = [ "?? test/gitan/", ]
     assert_equal(true , @r00.to_be_staged?)
 
-    @r00.outputs["git status -s"] = [
+    @r00.outputs["git status --porcelain"] = [ " M Gemfile", ]
+    assert_equal(true , @r00.to_be_staged?)
+
+    @r00.outputs["git status --porcelain"] = [ "M  Gemfile", ]
+    assert_equal(false, @r00.to_be_staged?)
+
+    @r00.outputs["git status --porcelain"] = [
       " M Gemfile",
       "AM bin/gitanstatus",
     ]
-    assert_equal(false, @r00.to_be_staged?)
+    assert_equal(true , @r00.to_be_staged?)
+
+    @r00.outputs["git status --porcelain"] = [
+      "?? Gemfile",
+      "A  bin/gitanstatus",
+    ]
+    assert_equal(true , @r00.to_be_staged?)
   end
 
   def test_to_be_commited?
     assert_equal(false, @r00.to_be_commited?)
     assert_equal(true , @r01.to_be_commited?)
 
-    @r00.outputs["git status -s"] = [
+    @r00.outputs["git status --porcelain"] = [
         "?? test/gitan/",
     ]
     assert_equal(false, @r00.to_be_commited?)
 
-    @r00.outputs["git status -s"] = [
+    @r00.outputs["git status --porcelain"] = [
       " M Gemfile",
       "AM bin/gitanstatus",
     ]
@@ -132,16 +177,16 @@ class TestRepo < Test::Unit::TestCase
   def test_command_output_lines
     assert_equal(
       [
-        "b4a9cab36b51cc8ca9b9a67d4b7c82abf6f02df4",
-        "d37ebd5948c87c142cf52572c44f032896879ec9",
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
       ],
       @r00.command_output_lines("git rev-parse --remotes")
     )
 
     assert_equal(
       [
-        "6671b434a3ed6414cab0c676a90c575bbb03d9da",
-        "d37ebd5948c87c142cf52572c44f032896879ec9",
+        "cccccccccccccccccccccccccccccccccccccccc",
+        "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
       ],
       @r01.command_output_lines("git rev-parse --remotes")
     )
@@ -151,6 +196,7 @@ class TestRepo < Test::Unit::TestCase
     assert_equal(false, @r00.to_be_pushed?)
     assert_equal(true , @r01.to_be_pushed?)
     assert_equal(false , @r03.to_be_pushed?)
+    assert_equal(false , @r06.to_be_pushed?)
   end
 
   def test_multiple_branch?
@@ -160,9 +206,22 @@ class TestRepo < Test::Unit::TestCase
   end
 
   def test_short_status
-    assert_equal("     r00", @r00.short_status)
-    assert_equal("BSCP r01", @r01.short_status)
-    assert_equal("BS   r02", @r02.short_status)
+    assert_equal("      r00", @r00.short_status)
+    assert_equal(" BSCP r01", @r01.short_status)
+    assert_equal(" BS   r02", @r02.short_status)
+    assert_equal("L     r04", @r04.short_status)
+    assert_equal("      r05", @r05.short_status)
   end
 
+  def test_head
+    assert_equal("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                 @r00.head)
+  end
+
+  def test_to_be_pulled?
+    assert_equal(true , @r04.to_be_pulled?)
+    assert_equal(false, @r05.to_be_pulled?)
+  end
+
+
 end

data/test/test_gitan.rb

@@ -9,10 +9,12 @@ require 'helper'
 #
 gem "test-unit"
 require "test/unit"
+require "gitan"
+require "pp"
 
-class SampleTest < Test::Unit::TestCase
-  def test_foo
-    #assert_equal(1,1)
-    #assert_equal(1,2)
+class TestGitan < Test::Unit::TestCase
+  def test_remote_heads
+    ##How should be tested?
+    #pp Gitan.remote_heads("localhost", "/home/git")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitan
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -94,7 +94,7 @@ dependencies:
 description: This gem provides some commands to manage multiple git repositories.
 email: ippei94da@gmail.com
 executables:
-- gitanstatus
+- gitan
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -107,7 +107,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- bin/gitanstatus
+- bin/gitan
 - gitan.gemspec
 - lib/gitan.rb
 - lib/gitan/repo.rb
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 640285007
+      hash: -792430867
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/bin/gitanstatus

@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby
-
-require "gitan"
-
-if ARGV.empty?
-  git_dir = ENV["HOME"] + "/git"
-else
-  git_dir = File::expand_path(ARGV[0])
-end
-
-
-Gitan::Repo.show_abbreviation($stdout)
-
-repos = {}
-Dir.glob(git_dir + "/*").sort.map do |path|
-  next unless File.directory? path
-  repo = Gitan::Repo.new(path)
-  puts repo.short_status
-  #pp dirname
-  #begin
-  #  repos[File.basename file] = Gitan::Repo.new( Grit::Repo.new(file))
-  #rescue Grit::InvalidGitRepositoryError
-  #  next
-  #end
-
-end