sprout 0.5.15 → 0.5.19

data/bin/sprout

@@ -17,15 +17,12 @@ include PatternPark
 OPTIONS = {
   :locations          => [],
   :project_name       => nil,
-  :found_project_name => nil,
   :sprout_name        => nil,
   :update             => false,
   :update             => false,
   :clean              => false
 }
 
-MANDATORY_OPTIONS = %w( sprout_name )
-
 parser = OptionParser.new do |opts|
   opts.banner = <<BANNER
 Sprouts is an open-source, cross-platform project generation and configuration tool
@@ -40,6 +37,11 @@ Options are:
 BANNER
   opts.separator ""
   opts.on("-s", "--sprout=NAME", String,
+          "[DEPRECATED] The name of the sprout to create (e.g., as2 as3, haxe, or mxml)"
+          ) do |name|
+            OPTIONS[:sprout_name] = name
+          end
+  opts.on("-n", "--name=NAME", String,
           "The name of the sprout to create (e.g., as2 as3, haxe, or mxml)"
           ) do |name|
             OPTIONS[:sprout_name] = name
@@ -63,33 +65,10 @@ BANNER
           "Show this help message.") { puts opts; exit }
   opts.parse!(ARGV)
   
-  OPTIONS[:project_name] = ARGV.pop
-  
-  if(OPTIONS[:sprout_name].nil?)
-    puts "\n[ERROR] You MUST provide a sprout name.\n\n"
-  end
-  
-  if(OPTIONS[:sprout_name] && !OPTIONS[:project_name])
-    dir = Sprout.project_path
-    begin
-      rakefile = Sprout.rakefile
-      if(!rakefile.nil? && File.exists?(rakefile))
-        require rakefile
-        name = ProjectModel.instance.project_name
-      end
-    rescue LoadError
-      name = File.basename(File.dirname(dir))
-    end
-    puts "\n[WARNING] No project name specified, Do you want to use '#{name}' as the project name and install the #{OPTIONS[:sprout_name]} sprout into #{dir}? [Yn]\n\n"
-    answer = $stdin.gets.chomp
-    if(answer.downcase != "y" && answer != "")
-      puts opts; exit
-    end
-    OPTIONS[:found_project_name] = name
-  end
-
-  if MANDATORY_OPTIONS && MANDATORY_OPTIONS.find { |option| OPTIONS[option.to_sym].nil? }
-    puts opts; puts ''; exit
+  if(OPTIONS[:sprout_name].nil? && OPTIONS[:update])
+    OPTIONS[:sprout_name] = ARGV.pop
+  else
+    OPTIONS[:project_name] = ARGV.pop
   end
 end
 
@@ -97,7 +76,6 @@ end
 
 sprout_name         = OPTIONS[:sprout_name]
 project_name        = OPTIONS[:project_name]
-found_project_name  = OPTIONS[:found_project_name]
 locations           = OPTIONS[:locations]
 update              = OPTIONS[:update]
 clean               = OPTIONS[:clean]
@@ -109,18 +87,65 @@ if(locations.size > 0)
   Sprout.insert_locations(OPTIONS[:locations])
 end
 
+if(sprout_name.nil?)
+  puts "\n[ERROR] You MUST provide a sprout name, this is usually done with the -s [NAME] commandline option. Please enter a sprout name now:\n"
+  sprout_name = gets
+end
+
 if(update)
-  Sprout.update = true
   msg = <<EOF
 [WARNING] Are you sure you want to clobber all local sprout definitions referenced by "#{sprout_name}"? [Yn]
 EOF
   puts msg
   response = gets.chomp!
-  if(response != '' && response.downcase != 'y')
+  if(response == '' || response.downcase == 'y')
+    Sprout.update = true
+  else
+    Log.puts("[ERROR] Sprout execution terminated, please try again.")
     exit
   end
 end
 
+if(sprout_name && !project_name)
+  dir = Sprout.project_path
+
+  begin
+    rakefile = Sprout.rakefile
+    if(!rakefile.nil? && File.exists?(rakefile))
+      require rakefile
+      name = ProjectModel.instance.project_name
+      puts 'rakefile: ' + rakefile
+    else
+      raise LoadError.new('rakefile was not found')
+    end
+  rescue LoadError
+    name = File.basename(dir).capitalize
+  end
+  
+  puts "\n[WARNING] No project name specified, please choose from the following:"
+  puts "(1) Enter Name: Let me enter a project name and execute from #{dir}"
+  puts "(2) No Project: I'm just updating some sprout definitions"
+  puts "(3) End Process: OOPs, I'll start over..."
+  if(name != nil && name != '')
+    puts "(4) Use Inferred Name: '#{name}' and load '#{sprout_name}' into #{dir}"
+  end
+  
+  answer = $stdin.gets.chomp
+  
+  case answer
+    when "1" :
+      puts "Enter a project name now:"
+      project_name = gets.chomp!
+    when "2" :
+    when "4" :
+      project_name = name
+    else
+      Log.puts("[ERROR] Sprout execution terminated, please try again.")
+      exit
+  end
+
+end
+
 # Create a new named Project
 if(sprout_name && project_name)
   path = File.join(Sprout.project_path, project_name)
@@ -152,14 +177,7 @@ if(sprout_name && project_name)
   sprout.execute
 end
 
-if(sprout_name && !project_name)
-  sprout = Sprout.load(sprout_name)
-  sprout.execute
-end
-
-# Resolve the sprout within the current project
-if(found_project_name && update && sprout_name)
-  Sprout.project_name = found_project_name
+if(sprout_name && update && !project_name)
   sprout = Sprout.load(sprout_name)
   sprout.execute
 end

data/lib/remote_file_loader.rb

@@ -180,7 +180,8 @@ module PatternPark
     
     def is_targz?(file)
       parts = file.split('.')
-      return (parts.pop == 'gz' && parts.pop == 'tar')
+      part = parts.pop
+      return (part == 'tgz' || part == 'gz' && parts.pop == 'tar')
     end
     
     def is_gzip?(file)
@@ -199,4 +200,4 @@ module PatternPark
       return (file.split('.').pop == 'dmg')
     end
   end
-end
+end

data/lib/remote_file_target.rb

@@ -20,8 +20,12 @@ module PatternPark
       if(!file_name.nil?)
         return
       end
-      @file_name = url.split('/').pop
-      @downloaded_path = File.join(Sprout.cache, type, install_path, file_name)
+      if(url.nil? || url == '')
+        @file_name = ''
+      else
+        @file_name = url.split('/').pop
+        @downloaded_path = File.join(Sprout.cache, type, install_path, file_name)
+      end
       if(archive_type == 'txt' || archive_type == 'exe')
         @install_path = File.join(Sprout.cache, type, install_path)
       else
@@ -43,6 +47,9 @@ module PatternPark
       if(Sprout.update || !File.exists?(install_path))
         # unpack into install path
         loader.unpack_downloaded_file(downloaded_path, install_path)
+        if(post_install)
+          eval(post_install)
+        end
       end
     end
   end

data/lib/sprout.rb

@@ -54,9 +54,9 @@ module PatternPark
             loader = RemoteFileLoader.new
             loader.get_remote_file(url + name, local)
             sprout = Sprout.load_local(local)
-            if(sprout.post_install)
-              eval(sprout.post_install)
-            end
+#            if(sprout.post_install)
+#              eval(sprout.post_install)
+#            end
             return sprout
           rescue OpenURI::HTTPError => e
             Log.puts("[WARNING] Sprout not found at: #{url + name}, trying next location")
@@ -104,8 +104,14 @@ module PatternPark
     # Begin loading and resolving this Sprout instance
     # and recursively call on dependencies
     def resolve
-      load_target
-      load_dependencies
+      begin
+        load_target
+        load_dependencies
+      rescue StandardError => e
+        puts "[ERROR] Sprout '#{name}' encountered an error, this may prevent your project from working correctly!"
+        puts e
+        puts e.backtrace
+      end
     end
     
     def execute
@@ -128,7 +134,7 @@ module PatternPark
       if(target)
         # Forward type name so that RemoteFileTargets can place
         # downloaded files into the appropriate user home folder
-        target.type = type 
+        target.type = type
         target.resolve
       end
     end

data/lib/sprout/version.rb

@@ -2,7 +2,7 @@ module Sprout #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 16
+    TINY  = 20
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: sprout
 version: !ruby/object:Gem::Version 
-  version: 0.5.15
+  version: 0.5.19
 date: 2007-07-02 00:00:00 -07:00
 summary: "Sprouts is an open-source, cross-platform project generation and configuration
   tool."