magnoline 0.1 → 0.2

data/README

@@ -1,18 +1,45 @@
-Magnoline is a simple command line tool to import/export 
+Magnoline is a simple command line tool to import/export content from
+ the Magnolia (http://www.magnolia.info)  CMS.
 The port done in ruby is good bit faster than the java implementation.
+Also, you don't need to tweak the memory settings to just make it run. 
 
-main_client.rb is the entry class, and you may want to type something like:
-ruby main_client.rb --help
+== INSTALL 
+To install it, the only thing you should have to do is:
+	
+	gem install magnoline
 
-to see the different options.
+Magnoline requires:
+- cooloptions as a dependencies, but that should be pulled up by the gem install.
+Magnoline includes:
+- http-access2: because it was not available as a separate gem. 
+I will remove it from current code as soon as it is.
 
-This tool requires:
-- cooloptions as a dependencies, but that should be pulled up by the gem install
+== CLIENT OPTIONS
+main_client.rb is the entry class, To see the different options  you can simply  type:
+	
+	ruby main_client.rb --help
+	
+== EXAMPLES
 
-This tool includes:
-- http-access2: because it was not available as a separate gem. I will remove it from here
-as soon as it is.
+** export default from junkie.com server
+	
+	ruby main_client.rb -a export -s http://junkie.com/magnoliaAuthor
+	
+** export the superuser section from the users repository
+	
+	ruby main_client.rb -a export -w users -r /superuser
+	
+** pull the content of the website in a file named website.xml in the current folder. 
+(Note that this is not recommended, as all the jackrabbit secret and heavy info will be in the
+exported file) 
+	
+	ruby main_client.rb -a export -w website -r /
 
+** batch file, processing:
+	
+	ruby main_client.rb -a export --batch-file ./batch_export_example_file.txt
+	
+== 
 That's it. Enjoy !
 
 Niko 

data/lib/magnolia_i_e.rb

@@ -60,20 +60,44 @@ module MagnoliaClient
                 opt.on 'behavior STRING', 'import behavior. One of new/remove/replace or 0/1/2', "0"
                 opt.on 'verbose', 'give some more processing info on the command line', false
                 opt.on 'console', 'output to standard output, bypass the out option', false
+                opt.on 'batch-file STRING','start a batch execution of actions from a file. Path to that file', nil
                 
                 opt.after do |r|
                     r.out = File.expand_path(r.out)
                     opt.error("Invalid action:"+r.action) unless (r.action == CMD_IMPORT || r.action == CMD_EXPORT)        
                     host = URI.parse(r.server_url).host
-                    opt.error("host is not reachable:" + host) unless Ping.pingecho(host,10)  
+                    #opt.error("host is not reachable:" + host) unless Ping.pingecho(host,10)  
                     r.behavior = parse_behavior(r.behavior) if r.action == CMD_IMPORT
-                    
                 end        
+                
             end
             
+            if !options.batch_file 
+                Array.new << get_action(options)
+            else
+                commands = Array.new
+                open(File.expand_path(options.batch_file)) do |file|
+                    file.each do |l| 
+                        if not l[0] == '#'  
+                            opts = l.split(/\s+/)
+                            
+                            options.workspace = opts[0]
+                            options.repository_path = opts[1]
+                            options.import_file = opts[2] if options.action == CMD_IMPORT
+                            
+                            commands << get_action(options)
+                        else 
+                            # skip the line. This is a comment
+                        end
+                    end 
+                end
+                return commands
+            end 
+        end
+        
+        def get_action(options)
             return Export.new(options) if options.action == CMD_EXPORT
             return Import.new(options) if options.action == CMD_IMPORT
-            
         end
         
         #
@@ -81,7 +105,7 @@ module MagnoliaClient
         # Do this while parsing to get proper error output when needed
         def parse_behavior(value)
             IMPORT_BEHAVIORS.each_with_index { |behavior, index|
-                return index  if value.to_i == index
+                return index if value.to_i == index
                 return index if value.to_s == behavior.to_s
             }
             raise "Invalid behavior:#{value}"
@@ -107,12 +131,23 @@ module MagnoliaClient
             @workspace = options.workspace
             @user = options.user
             @password = options.password
-            @out = File.expand_path(options.out+'/'+@workspace+@repository_path.gsub('/','.')+'.xml')
-            
             @verbose = options.verbose
             @options = options
+            @out = outfile_path
         end    
         
+        #
+        # compute the outfile path 
+        # take special care when the repository_path is the root 
+        def outfile_path
+            subr = if @repository_path == '/' 
+            ''
+            else
+                @repository_path.gsub('/','.') 
+            end
+            File.expand_path(@options.out+'/'+@workspace+subr+'.xml')
+        end
+        
         #
         # prepare form data. Should return a hash with the needed parameters
         # this has to be implemented in the subclasses
@@ -126,8 +161,8 @@ module MagnoliaClient
         def pad_data(data)
             data.each { |key,value| begin
                     if not key==:mgnlFileImport 
-                    value = value + " "; 
-                    data[key] = value.to_s
+                        value = value + " "; 
+                        data[key] = value.to_s
                     end
                 rescue
                 end

data/lib/main_client.rb

@@ -26,14 +26,14 @@ require 'magnolia_i_e'
 # Create command line parser
 ies = MagnoliaClient::ImportExportSetUp.new
 
-# parse the parameters
+# parse the parameters, and get an array of commands
 t1 = Time.new
-ie = ies.parse(ARGV)
+ie_array = ies.parse(ARGV)
 t2 = Time.new
 puts "parse took:"+ (t2 - t1).to_s
 
-# execute the command
+# execute the command(s)
 t3 = Time.new
-ie.exec
+ie_array.each {|ie| ie.exec}
 t4 = Time.new
 puts "exec took:"+ (t4 - t3).to_s

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: magnoline
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2007-01-24 00:00:00 +09:00
+  version: "0.2"
+date: 2007-01-25 00:00:00 +09:00
 summary: A command line interface to the Magnolia CMS
 require_paths: 
 - lib