sprout 0.7.223-darwin → 0.7.224-darwin

data/lib/platform.rb

@@ -54,9 +54,6 @@ module Platform #:nodoc:
    elsif RUBY_PLATFORM =~ /netbsd/i
       os = :unix
       impl = :netbsd
-  elsif RUBY_PLATFORM =~ /solaris/i
-      os = :unix
-      impl = :solaris
    elsif RUBY_PLATFORM =~ /vista/i
       os = :win32
       impl = :vista
@@ -87,7 +84,6 @@ module Platform #:nodoc:
    end
    
    # whither AIX, SOLARIS, and the other unixen?
-   # i386-solaris2.11
    
    if RUBY_PLATFORM =~ /(i\d86)/i
       arch = :x86

data/lib/sprout.rb

@@ -157,8 +157,7 @@ module Sprout
         command = "#{get_gem_preamble} uninstall -x -a -q #{sprout.name}"
 
         if(!confirmation)
-          confirmation = remove_gems_confirmation
-          break unless confirmation
+          break unless confirmation = remove_gems_confirmation
         end
         puts "executing #{command}"
         raise ">> Exited with errors: #{$?}" unless system(command)

data/lib/sprout/builder.rb

@@ -30,7 +30,7 @@ module Sprout
           return target
         end
       end
-      raise BuilderError.new("Sprout::Builder.build failed, unsupported platform [#{platform}] or unexpected yaml")
+      raise BuilderError.new("Sprout::Builder.build failed, unsupported platform or unexpected yaml")
     end
     
     private

data/lib/sprout/tasks/gem_wrap_task.rb

@@ -55,9 +55,9 @@ module Sprout
     # Homepage where users can learn more about this gem
     attr_writer :homepage
     # A string remote file specification usually something like:
-    #
+    # 
     #   t.sprout_spec   =<<EOF
-    #   - !ruby/object:Sprout::RemoteFileTarget
+    #   - !ruby/object:Sprout::RemoteFileTarget 
     #     platform: universal
     #     url: http://as3flickrlib.googlecode.com/files/flickr-.87.zip
     #     archive_path: flickr-.87/src
@@ -83,7 +83,7 @@ module Sprout
       @email          = "projectsprouts@googlegroups.com"
       @homepage       = "http://www.projectsprouts.org"
     end
-
+  
     def execute(*args) # :nodoc:
       super
       raise GemWrapError.new("A version must be provided to produce a Gem!") unless @version
@@ -94,7 +94,7 @@ module Sprout
 #      render_extensions(gem_package, extensions) if extensions.size
 
       Dir.chdir(gem_package) do
-
+  
         spec = Gem::Specification.new do |s|
           files           = []
           s.platform      = Gem::Platform::RUBY
@@ -104,17 +104,15 @@ module Sprout
           s.name          = @gem_name
           s.email         = @email
           s.homepage      = @homepage
-          # added in order to avoid the lib not found error
-          s.require_path  = "sprout.spec"
           s.rubyforge_project = 'sprout'
           gem_dependencies.each do |dep|
             s.requirements << dep
           end
-
+          
           sprout_requirement = s.requirements.collect do |req|
             (req[0] == 'sprout')
           end
-
+          
           if(!sprout_requirement)
             s.add_dependency('sprout', '>= 0.7.209')
           end
@@ -133,13 +131,13 @@ module Sprout
         Gem::Builder.new(spec).build
       end
 
-      FileUtils.mv("#{gem_package}/#{@gem_name}-#{@version}.gem", @package)
+      FileUtils.mv("#{gem_package}/#{@gem_name}-#{@version}.gem", @package)  
       FileUtils.rm_rf(gem_package)
     end
-
+    
     # Add a gem dependency either with only the gem name
     # or with a full name and version hash like:
-    #
+    # 
     #   t.add_dependency('sprout-flashplayer-tool')
     # or
     #   t.add_dependency('sprout-flashplayer-tool' => '9.115.0')
@@ -151,12 +149,12 @@ module Sprout
     def gem_dependencies
       return @gem_dependencies ||= []
     end
-
+    
     # Add files to include in the gem/ext folder
     def extensions
       return @extensions ||= []
     end
-
+    
     private
 
     def gem_package

data/lib/sprout/tasks/tool_task.rb

@@ -367,8 +367,7 @@ module Sprout
       end
       param = param_hash[cleaned]
 
-      matched = name =~ /=$/
-      if(matched)
+      if(name =~ /=$/)
         param.value = args.shift
       elsif(param)
         param.value

data/lib/sprout/template_resolver.rb

@@ -0,0 +1,207 @@
+
+module Sprout
+  
+  class TemplateResolver < Hash #:nodoc:
+    include Singleton
+    
+    attr_accessor :replace_all, 
+                  :ignore_all
+                  
+    @@SPROUT_FILE_NAME = 'Sprout'
+    @@RENDER_IGNORE_FILES = ['asclass_config.rb', 'SWFMillTemplate.erb', 'Template.erb']
+    @@BINARY_EXTENSIONS = ['.jpg', '.png', '.gif', '.doc', '.xls', '.exe', '.swf', 'fla', '.psd']
+    @@LOG_PREFIX = ">> Created file: "
+    @@DELETE_PREFIX = ">> Deleted file: "
+
+    def initialize
+      super
+      @replace_all = false
+      @ignore_all = false
+    end
+    
+    def copy_files(from, to, render=false)
+      created_files = Array.new
+      if(!File.exists? from)
+        raise UsageError.new('TemplateResolver attempted to copy files from (' + from + ') but it does not exist...')
+      end
+      if(File.directory? from)
+        Dir.open(from).each do |filename|
+          if(!Sprout.ignore_file? filename)
+            fullname = File.join(from, filename)
+            new_fullname = File.join(to, filename)
+            cleaned_filename = clean_file_name(filename)
+            cleaned_fullname = File.join(to, cleaned_filename)
+            if(File.directory? fullname)
+              Dir.mkdir(new_fullname) unless File.exists? new_fullname
+              puts new_fullname
+              copy_files(fullname, new_fullname, render)
+            else
+              file = copy_file(fullname, cleaned_fullname, render)
+            end
+          end
+        end
+      else
+        raise UsageError.new("copy_files called with a file (" + from + ") instead of a directory!")
+      end
+      
+      return created_files
+    end
+    
+    def puts(file, is_delete=false)
+      prefix = (is_delete) ? @@DELETE_PREFIX : @@LOG_PREFIX
+      Log.puts(prefix + file.gsub(Dir.pwd + '/', ''))
+    end
+    
+    def b(path)
+      (is_binary?(path)) ? 'b' : '' 
+    end
+    
+    def copy_file(from, to, render=false, delegate=nil)
+      if(write_file?(to))
+        content = nil
+        File.open(from, 'r' + b(from)) do |f|
+          content = f.read
+        end
+        if(render && should_render?(from))
+          begin
+            bind = (delegate.nil?) ? binding : delegate.get_binding
+            content = ERB.new(content, nil, '>').result(bind)
+          rescue NameError => e
+            Log.puts '>> Template ' + from + ' references a value that is not defined'
+            raise e
+          end
+        end
+        FileUtils.makedirs(File.dirname(to))
+        File.open(to, 'w' + b(to)) do |f|
+          f.write(content)
+        end
+        puts to
+        return to
+      end
+      return nil
+    end
+    
+    def should_render?(file)
+      if(is_binary?(file) || @@RENDER_IGNORE_FILES.index(File.basename(file)))
+        return false
+      end
+      return true
+    end
+    
+    def write_file?(file)
+      if(!File.exists?(file))
+        return true
+      elsif(@replace_all)
+        puts(file, true)
+        File.delete(file)
+        return true
+      elsif(@ignore_all)
+        return false
+      end
+
+      relative = file.gsub(Dir.pwd, '')
+      msg = <<EOF
+
+[WARNING] Sprout Encountered an existing file at [#{relative}], what would you like to do?
+(r)eplace, (i)gnore, (R)eplace all or (I)gnore all?
+
+EOF
+      if(Log.debug)
+        return false
+      end
+
+      $stdout.puts msg
+      answer = $stdin.gets.chomp
+      if(answer == 'r')
+        return true
+      elsif(answer == 'i')
+        return false
+      elsif(answer == 'R')
+        msg = <<EOF
+        
+Are you sure you want to replace ALL duplicate files?
+(y)es or (n)o
+
+EOF
+        $stdout.puts msg
+        answer = $stdin.gets.chomp
+        if(answer == 'y')
+          @replace_all = true
+        else
+          write_file?(file)
+        end
+      elsif(answer == 'I')
+        @ignore_all = true
+        return false
+      else
+        $stdout.puts "I didn't understand that response... Please choose from the following choices:\n\n"
+        write_file?(file)
+      end
+    end
+    
+    def render_file filename
+      file = File.open(filename, 'r')
+      resolved = ERB.new(file.read, nil, '>').result(binding)
+      file.close
+      file = File.open(filename, 'w')
+      file.write(resolved)
+      file.close
+    end
+    
+    def clean_file_name name
+      return name.gsub(@@SPROUT_FILE_NAME, project_name)
+    end
+    
+    def project_name
+      return Sprout.project_name
+    end
+    
+    def instance_name
+      return project_name[0,1].downcase + project_name[1,project_name.size]
+    end
+    
+    #TODO: Figure out if the file is plain text or not... Possible?
+    def is_binary? file
+      file_extension = File.extname(file).downcase
+      @@BINARY_EXTENSIONS.each do |ext|
+        if(file_extension == ext)
+          return true
+        end
+      end
+      return false
+    end
+
+=begin
+  Found this code for binary inspection here:
+  http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/44940
+  it's not 100%, but better than what I'm doing with extensions.
+  This should be tested and inserted above
+  if it works.
+
+  NON_ASCII_PRINTABLE = /[^\x20-\x7e\s]/
+
+  def nonbinary?(io, forbidden, size = 1024)
+    while buf = io.read(size)
+      return false if forbidden =~ buf
+    end
+    true
+  end
+
+  # usage: ruby this_script.rb filename ...
+  ARGV.each do |fn|
+    begin
+      open(fn) do |f|
+        if nonbinary?(f, NON_ASCII_PRINTABLE)
+          puts "#{fn}: ascii printable"
+        else
+          puts "#{fn}: binary"
+        end
+      end
+    rescue StandardError => e
+      puts "#$0: #$!"
+    end
+  end
+=end
+
+  end
+end

data/lib/sprout/version.rb

@@ -3,7 +3,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 7
-      TINY  = 225
+      TINY  = 224
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       MAJOR_MINOR = [MAJOR, MINOR].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprout
 version: !ruby/object:Gem::Version 
-  version: 0.7.223
+  version: 0.7.224
 platform: darwin
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -08:00
+date: 2010-02-15 00:00:00 -08:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,6 +122,7 @@ files:
 - lib/sprout/tasks/ssh_task.rb
 - lib/sprout/tasks/tool_task.rb
 - lib/sprout/tasks/zip_task.rb
+- lib/sprout/template_resolver.rb
 - lib/sprout/tool_task_model.rb
 - lib/sprout/user.rb
 - lib/sprout/version.rb