rorsvnprep 0.1.0 → 0.1.1

data/bin/rorsvnprep

@@ -82,11 +82,10 @@ class RORSVNPREP < Hash
   def initialize
     super()
     
-    puts ARGV.join(', ')
-    
     self[:svnuri] = ""
     self[:password] = ""
     self[:verbose] = false
+    self[:log] = false
     
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: rorsvnprep project [options]"
@@ -107,6 +106,10 @@ class RORSVNPREP < Hash
         self[:verbose] = true
       end
       
+      opts.on( '--log', 'create a log of command activity' ) do
+        self[:log] = true
+      end
+      
       opts.separator ""
       opts.separator "General Options:"
       opts.separator ""
@@ -128,30 +131,35 @@ end
 
 arguments = RORSVNPREP.new
 
-puts ARGV.join(', ')
-
-# For each project name supplied roll through the preparation cycle
+# Grab the project name to use
 project = ARGV.first
 
-  svnuri = arguments[:svnuri]
-  password = arguments[:password]
+# Create some useful variables to pass around
+svnuri = arguments[:svnuri]
+password = arguments[:password]
+verbose = arguments[:verbose]
+logfile = File::new( "rorsvnprep.log", "a" ) if arguments[:log]
 
-  # TODO: Switch over to following code and remove everything beyond it
-  #
-  #rsp = RailsSVNPrep.new( $project, $svnuri, $password, $svnpath, $logfile )
-  #
-  #rsp.execute
+# Create an instance of our prep class with all our options
+rsp = RailsSVNPrep.new( project, svnuri, password, logfile, verbose )
 
-  # Create our new project
-  puts "Creating Rails project: #{project}" if arguments[:verbose]
+# TODO: Switch over to following code and remove everything beyond it
+#
+#rsp.run
 
-  if arguments[:verbose]
-    system "rails #{project}"
-  else  
-    system "rails #{project} >> /dev/null"
-  end
+# Create a project
+rsp.create_project
 
-  Dir::chdir project
+# OLD: Create our new project
+#puts "Creating Rails project: #{project}" if arguments[:verbose]
+#
+#if arguments[:verbose]
+#  system "rails #{project}"
+#else  
+#  system "rails #{project} >> /dev/null"
+#end
+#
+#Dir::chdir project
 
   # Trim out all the stuff we don't want in the initial subversion import and
   # move some other stuff around.

data/lib/rorsvnprep.rb

@@ -8,73 +8,86 @@
 # utility. This class could also be implemented as part of another package to
 # provide further automated utilities.
 class RailsSVNPrep
-  @@version = [ 0, 1, 0 ]
+  @@version = [ 0, 1, 1 ]
   
   @project = nil
   @svn = nil
   @password = nil
-  @log = nil
+  @logfile = nil
+  @verbose = false
 
   # The new method expects up to four arguments. Only if the projname argument
   # is missing will the method raise an error for anything other than failed
   # validation.
-  def initialize(projname = nil, svnuri = nil, svnpass = nil, svnpath = nil, logfile = nil)
-    if projname
-      if RailsSVNPrep::validate_name(projname)
-        @project = proj_name
-      else
-        raise ArgumentError,  "Invalid Project Name Supplied", caller
-      end
-    else
-      raise ArgumentError, "No Project Name Supplied", caller
-    end
+  def initialize(projname = nil, svnuri = nil, svnpass = nil, logfile = nil, verbose = false)
+    @project = projname
+    @svn = svnuri
+    @password = svnpass
+    @log = logfile
+    @verbose = verbose
+  end
+
+  def run
+    puts "Rails SVN Prep: Starting." if @verbose
+    @logfile.puts "Rails SVN Prep: Starting." if @logfile
     
-    if svnuri
-      if RailsSVNPrep::validate_uri(svnuri)
-        @svn = svnuri
-      else
-        raise ArgumentError, "Invalid Subversion URI Supplied", caller
-      end
-    end
+    create_project
     
-    if svnpath
-      if RailsSVNPrep::validate_path(svnpath)
-        @svn += svnpath
-      else  
-        raise ArgumentError, "Invalid Subversion Path Supplied", caller
-      end
-    elsif @svn
-      @svn += "/#{@project}/trunk"
-    end
+    trim_project
     
-    if svnpass
-      if RailsSVNPrep::validate_password(svnpass)
-        @password = svnpass
-      else
-        raise ArgumentError, "Invalid Password Supplied", caller
-      end
-    end
+    generate_cvsignore unless @svn
+          
+    subversion_import if @svn
+    
+    subversion_checkout if @svn
+    
+    subversion_propset if @svn
     
-    @log = log
+    finalize
     
-    @svn = RailsSVNPrep::normalize_svn(@svn)
+    puts "Rails SVN Prep: Complete." if @verbose
+    @logfile.puts "Rails SVN Prep: Complete." if @logfile
   end
   
   # This method creates a new project and moves us into the new directory. The
   # method makes direct call to the rails command and dumps the output to 
   # /dev/null.
   def create_project
-    if Dir::glob(@project)
-      raise StandardError, "Directory #{@project} already exists", caller
-    end
+    #if Dir::glob(@project)
+    #  puts "A folder named #{@project} already exists: exiting." if @verbose
+    #  @logfile.puts "A folder named #{@project} already exists: exiting." if @logfile
+    #  raise StandardError
+    #end
     
-    if system "rails #{@project} > /dev/null"
+    if system "rails #{@project} >> /dev/null"
+      puts "Rails Project Folder Successfully Created."  if @verbose
+      @logfile.puts "Rails Project Folder Successfully Created."  if @logfile
       Dir::chdir @project
     else
-      raise StandardError, "Unable to successfully run Rails", caller
+      puts "Error creating the Rails project folder: exiting." if @verbose
+      @logfile.puts "Error creating the Rails project folder: exiting." if @logfile
+      raise StandardError
     end
   end
 
+  def trim_project
+  end
+  
+  def generate_cvsignore
+  end
+  
+  def subversion_import
+  end
+  
+  def subversion_checkout
+  end
+  
+  def subversion_propset
+  end
+  
+  def finalize
+  end
+
   # A convenience method to return our version number
   def RailsSVNPrep.version
     @@version

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rorsvnprep
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-02-19 00:00:00 -05:00
+  version: 0.1.1
+date: 2007-02-20 00:00:00 -05:00
 summary: Provides additional automation to make managing Rails project with subversion easier.
 require_paths: 
 - lib