sub 0.1.0 → 0.3.0

data/History.txt

@@ -1,4 +1,9 @@
-== 0.0.1 2007-09-04
+== 0.3.0 2007-10-02
 
-* 1 major enhancement:
-  * Initial release
+* Bugfix: checks out externals that were added since last update
+* Bugfix: doesn't swallow parameter following url
+* You can now use either SUB_BASE_URL or SVN for the default repository path environment variable
+
+== 0.1.0 2007-09-04
+
+* Initial release

data/Manifest.txt

@@ -6,5 +6,9 @@ Rakefile
 bin/sub
 lib/sub.rb
 lib/sub/app.rb
+lib/sub/array.rb
+lib/sub/external.rb
+lib/sub/root.rb
+lib/sub/status.rb
 lib/sub/version.rb
 tasks/environment.rake

data/bin/sub

@@ -1,3 +1,4 @@
+#!/usr/local/bin/ruby
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'sub'
 Sub.from_args(ARGV).execute

data/lib/sub.rb

@@ -1,3 +1,6 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'sub/app'
+require 'sub/array'
+require 'sub/external'
+require 'sub/status'
+require 'sub/version'
+require 'sub/root'

data/lib/sub/app.rb

@@ -6,94 +6,6 @@ QUIET = 0
 NORMAL = 1
 VERBOSE = 2
 
-class External
-
-  def self.externals_in_directory(parent)
-    exts = []
-    prop = `svn propget svn:externals #{parent}`
-    prop.split("\n").each do |prop_line|
-      next if prop_line.strip.empty?
-      exts << External.new(parent, prop_line)
-    end
-    exts
-  end
-
-  attr_reader :name, :path, :url, :revision
-
-  def initialize(parent, property)
-    match =  /^(\S+)\s+(-r\s*\d*\s+)?(\S+)\s*$/.match(property)
-    @name = match[1]
-    @revision = match[2] ? match[2].gsub(/\D/,'').to_i : nil
-    @url = match[3]
-    @path = "#{parent}/#{@name}"
-  end
-
-  def ==(other)
-    (path == other.path and url == other.url)
-  end
-
-  def to_s
-    "External[name=#{name}, path=#{path}, url=#{url}, revision=#{revision}]"
-  end
-
-  def revision_actual
-    info = `svn info #{@path}`
-    info.grep(/^Revision:/).first.gsub(/Revision: /, '').to_i
-  end
-
-  def should_update?
-    revision == nil || revision_actual != revision
-  end
-
-end
-
-class Status
-  class Line
-    def initialize(text)
-      text.strip!
-      @modified = /^M/.match(text) ? true : false
-      @external = /^X/.match(text) ? true : false
-      @unversioned = /^\?/.match(text) ? true : false
-      @modified_properties = /^.M/.match(text) ? true : false
-      @path = text.gsub(/^...... /, '')
-    end
-
-    attr_reader :path
-
-    def modified?
-      @modified
-    end
-    def external?
-      @external
-    end
-    def unversioned?
-      @unversioned
-    end
-    def modified_properties?
-      @modified_properties
-    end
-  end
-
-
-  def initialize(text)
-    @lines = text.split("\n").collect do |line|
-      Status::Line.new(line)
-    end
-  end
-
-  def modified
-    @lines.select { |line| line.modified? }.collect {|line| line.path}
-  end
-
-  def externals
-    @lines.select { |line| line.external? }.collect {|line| line.path}
-  end
-
-  def unversioned
-    @lines.select { |line| line.unversioned? }.collect {|line| line.path}
-  end
-end
-
 class Sub
   DEFAULT_BASE_URL = "svn+ssh://rubyforge.org/var/svn"
 
@@ -117,7 +29,10 @@ class Sub
         options[:clean] = true
       when '--url'
         args.shift
-        options[:url] = args.shift
+        options[:url] = args[0]
+      when '--version'
+        puts "Sub version #{Sub::VERSION::STRING}"
+        exit 0
       else
         still_parsing_options = false
       end
@@ -127,17 +42,16 @@ class Sub
     Sub.new(options, args)
   end
 
-  attr_reader :verbosity, :clean, :command, :args, :url
+  attr_reader :clean, :command, :args, :url
+  attr_accessor :verbosity
 
   def initialize(options = {:verbosity => NORMAL}, args = [])
     options = defaults.merge(options)
     @verbosity = options[:verbosity]
     @clean = options[:clean]
     @command = options[:command]
-    @url = options[:url] || ENV['SUB_BASE_URL'] || DEFAULT_BASE_URL
+    @url = options[:url] || ENV['SUB_BASE_URL'] || ENV['SVN'] || DEFAULT_BASE_URL
     @args = args
-
-    @status = {}
   end
 
   def defaults
@@ -173,6 +87,8 @@ class Sub
     puts """
 sub - Alex's wrapper for subversion
 
+Version: #{Sub::VERSION::STRING}
+
 Usage:
   sub co project_name [dir_name]
     checks out [base_url]/project_name/trunk into ./project_name (or dir_name if specified)
@@ -192,7 +108,9 @@ Options:
       'up' command removes all unversioned files and directories
   --url [base_url]
       sets base repository url for 'co' command
-      (default is ENV['SUB_BASE_URL'] or #{DEFAULT_BASE_URL})
+      (default is ENV['SUB_BASE_URL'] or ENV['SVN'] or #{DEFAULT_BASE_URL})
+  --version
+      prints release version
   """
   end
 
@@ -207,100 +125,11 @@ Options:
   end
 
   def update(root)
-    if @clean
-      remove_unversioned(root)
-    end
-
-    externals_before = externals(root)
-    svn("up --ignore-externals #{root}")
-    externals = externals(root)
-    # for some reason (array - array) doesn't work right here
-    # so i had to write my own subtract method
-    removed_externals = externals_before.subtract(externals)
-    removed_externals.each do |ext|
-      say "Removed external #{ext}"
-      FileUtils.rm_rf(ext.path)
-    end
-
-    added_externals = externals.subtract(externals_before)
-    existing_externals = externals.subtract(added_externals)
-
-    # todo: extract Processes
-    processes = []
-    def update_external(processes, external)
-      pid = fork do
-        say "Updating external #{external.path}"
-        run("svn cleanup #{external.path}") if File.exists?(external.path)
-        rev = external.revision.nil? ? '' : "-r#{external.revision}"
-        svn("up #{rev} #{external.path} | grep -v 'At revision'")
-      end
-      processes << {:pid => pid, :external => external}
-    end
-
-    def checkout_external(processes, external)
-      pid = fork do
-        say "Checking out external #{external.path}"
-        rev = external.revision.nil? ? '' : "-r#{external.revision}"
-        svn("co #{rev} #{external.url} #{external.path}")
-      end
-      processes << {:pid => pid, :external => external}
-    end
-
-    added_externals.each do |external|
-      checkout_external(processes, external)
-    end
-
-    already_up_to_date = []
-    existing_externals.each do |external|
-      if external.should_update?
-        update_external(processes, external)
-      else
-        already_up_to_date << external
-      end
-    end
-
-    unless already_up_to_date.empty?
-      say("External#{'s' if already_up_to_date.size > 1} " +
-        already_up_to_date.collect {|external| external.name}.join(", ") +
-        " already up to date")
-    end
-
-    processes.each do |process|
-      Process.waitpid(process[:pid], 0)
-    end
-  end
-
-  def remove_unversioned(root)
-    status(root).unversioned.each do |path|
-      if File.directory?(path)
-        say "Removing unversioned directory #{path}"
-      else
-        say "Removing unversioned file #{path}"
-      end
-      FileUtils.rm_rf(path)
-    end
-  end
-
-  def status(root)
-    @status[root] ||= Status.new(run("svn st #{root}", true))
+    Root.new(root, self, clean).update
   end
 
   def externals(root)
-    exts = []
-    directories_containing_externals(root).collect do |parent|
-      exts += External.externals_in_directory(parent)
-    end
-    exts
-  end
-
-  def directories_containing_externals(root)
-    status(root).externals.collect do |path|
-      if (path !~ /\//)
-        "."
-      else
-        path.gsub(/\/[^\/]*$/, '')        
-      end
-    end.uniq
+    Root.new(root, self, clean).externals
   end
 
   def parse_externals(st)
@@ -313,7 +142,7 @@ Options:
       prop = `svn propget svn:externals #{parent}`
       prop.split("\n").each do |external|
         next if external.strip.empty?
-        exts << External.new(parent, external)
+        exts << External.new(parent, external, self)
       end
     end
     exts
@@ -340,17 +169,3 @@ Options:
   end
 end
 
-class Array
-  def subtract(other)
-    self.select do |item|
-      !other.has?(item)
-    end
-  end
-
-  def has?(something)
-    self.each do |item|
-      return true if item == something
-    end
-    false
-  end
-end

data/lib/sub/array.rb

@@ -0,0 +1,14 @@
+class Array
+  def subtract(other)
+    self.select do |item|
+      !other.has?(item)
+    end
+  end
+
+  def has?(something)
+    self.each do |item|
+      return true if item == something
+    end
+    false
+  end
+end

data/lib/sub/external.rb

@@ -0,0 +1,67 @@
+class External
+
+  def self.externals_in_directory(parent, app)
+    exts = []
+    prop = `svn propget svn:externals #{parent}`
+    prop.split("\n").each do |prop_line|
+      next if prop_line.strip.empty?
+      exts << External.new(parent, prop_line, app)
+    end
+    exts
+  end
+
+  attr_reader :name, :path, :url, :revision, :app
+
+  def initialize(parent, property, app = nil)
+    match =  /^(\S+)\s+(-r\s*\d*\s+)?(\S+)\s*$/.match(property)
+    @name = match[1]
+    @revision = match[2] ? match[2].gsub(/\D/,'').to_i : nil
+    @url = match[3]
+    @path = "#{parent}/#{@name}"
+    @app = app
+  end
+
+  def say(msg)
+    app.say(msg)
+  end
+
+  def svn(cmd)
+    app.svn(cmd)
+  end
+
+  def run(cmd, return_output = false)
+    app.run(cmd, return_output)
+  end
+
+  def ==(other)
+    (path == other.path and url == other.url)
+  end
+
+  def to_s
+    "External[name=#{name}, path=#{path}, url=#{url}, revision=#{revision}]"
+  end
+
+  def revision_actual
+    info = `svn info #{@path}`
+    info.grep(/^Revision:/).first.gsub(/Revision: /, '').to_i
+  end
+
+  def should_update?
+    revision == nil || revision_actual != revision
+  end
+
+  #todo: test? (indirectly tested via root.rb)
+  def update
+    say "Updating external #{path}"
+    run("svn cleanup #{path}")
+    rev = revision.nil? ? '' : "-r#{revision}"
+    svn("up #{rev} #{path} | grep -v 'At revision'")
+  end
+
+  def checkout
+    say "Checking out external #{path}"
+    rev = revision.nil? ? '' : "-r#{revision}"
+    svn("co #{rev} #{url} #{path}")
+  end
+
+end

data/lib/sub/root.rb

@@ -0,0 +1,126 @@
+class Root
+  attr_reader :app, :root_path
+
+  def initialize(root_path, app, clean = false)
+    @root_path = root_path
+    @app = app
+    @clean = clean
+    @status = nil
+  end
+
+  def say(msg)
+    app.say(msg)
+  end
+
+  def svn(cmd)
+    app.svn(cmd)
+  end
+
+  def run(cmd, return_output = false)
+    app.run(cmd, return_output)
+  end
+
+  class Processes < Array
+    def initialize
+    end
+
+    def launch
+      pid = fork do
+        yield
+      end
+      self << pid
+    end
+
+    def join
+      self.each do |pid|
+        Process.waitpid(pid, 0)
+      end
+    end
+  end
+
+  def update
+    if @clean
+      remove_unversioned
+    end
+
+    externals_before = externals
+
+    svn("up --ignore-externals #{root_path}")
+    # for some reason (array - array) doesn't work right here
+    # so i had to write my own subtract method
+    removed_externals = externals_before.subtract(externals)
+    removed_externals.each do |ext|
+      say "Removed external #{ext}"
+      FileUtils.rm_rf(ext.path)
+    end
+
+    @processes = Processes.new
+
+    already_up_to_date = []
+    externals.each do |external|
+      if external.should_update?
+        if File.exists?(external.path)
+          update_external(external)
+        else
+          checkout_external(external)
+        end
+      else
+        already_up_to_date << external
+      end
+    end
+
+    unless already_up_to_date.empty?
+      say("External#{'s' if already_up_to_date.size > 1} " +
+        already_up_to_date.collect {|external| external.name}.join(", ") +
+        " already up to date")
+    end
+
+    @processes.join
+  end
+
+  def update_external(external)
+    @processes.launch do
+      external.update
+    end
+  end
+
+  def checkout_external(external)
+    @processes.launch do
+      external.checkout
+    end
+  end
+
+  def remove_unversioned
+    status.unversioned.each do |path|
+      if File.directory?(path)
+        say "Removing unversioned directory #{path}"
+      else
+        say "Removing unversioned file #{path}"
+      end
+      FileUtils.rm_rf(path)
+    end
+  end
+
+  def status
+    @status ||= Status.new(run("svn st #{root_path}", true))
+  end
+
+  def externals
+    exts = []
+    directories_containing_externals.collect do |parent|
+      exts += External.externals_in_directory(parent, app)
+    end
+    exts
+  end
+
+  def directories_containing_externals
+    status.externals.collect do |path|
+      if (path !~ /\//)
+        "."
+      else
+        path.gsub(/\/[^\/]*$/, '')
+      end
+    end.uniq
+  end
+
+end

data/lib/sub/status.rb

@@ -0,0 +1,46 @@
+class Status
+  class Line
+    def initialize(text)
+      text.strip!
+      @modified = /^M/.match(text) ? true : false
+      @external = /^X/.match(text) ? true : false
+      @unversioned = /^\?/.match(text) ? true : false
+      @modified_properties = /^.M/.match(text) ? true : false
+      @path = text.gsub(/^...... /, '')
+    end
+
+    attr_reader :path
+
+    def modified?
+      @modified
+    end
+    def external?
+      @external
+    end
+    def unversioned?
+      @unversioned
+    end
+    def modified_properties?
+      @modified_properties
+    end
+  end
+
+
+  def initialize(text)
+    @lines = text.split("\n").collect do |line|
+      Status::Line.new(line)
+    end
+  end
+
+  def modified
+    @lines.select { |line| line.modified? }.collect {|line| line.path}
+  end
+
+  def externals
+    @lines.select { |line| line.external? }.collect {|line| line.path}
+  end
+
+  def unversioned
+    @lines.select { |line| line.unversioned? }.collect {|line| line.path}
+  end
+end

data/lib/sub/version.rb

@@ -1,7 +1,7 @@
-module Pong #:nodoc:
+class Sub #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
+    MINOR = 3
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: sub
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-09-12 00:00:00 -07:00
+  version: 0.3.0
+date: 2007-10-02 00:00:00 -07:00
 summary: sub is a wrapper for svn that adds faster/safer updates, easy trunk checkout, etc.
 require_paths: 
 - lib
@@ -37,6 +37,10 @@ files:
 - bin/sub
 - lib/sub.rb
 - lib/sub/app.rb
+- lib/sub/array.rb
+- lib/sub/external.rb
+- lib/sub/root.rb
+- lib/sub/status.rb
 - lib/sub/version.rb
 - tasks/environment.rake
 test_files: []