sprout 1.0.29.pre → 1.0.31.pre

data/Gemfile.lock

@@ -0,0 +1,51 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ParseTree (3.0.6)
+      RubyInline (>= 3.7.0)
+      sexp_processor (>= 3.0.0)
+    RubyInline (3.8.6)
+      ZenTest (~> 4.3)
+    ZenTest (4.4.0)
+    archive-tar-minitar (0.5.2)
+    flay (1.4.1)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    flog (2.5.0)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    heckle (1.4.3)
+      ParseTree (>= 2.0.0)
+      ZenTest (>= 3.5.2)
+      ruby2ruby (>= 1.1.6)
+    mocha (0.9.8)
+      rake
+    open4 (1.0.1)
+    rake (0.8.7)
+    rcov (0.9.9)
+    rdoc (2.5.11)
+    ruby2ruby (1.2.5)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    ruby_parser (2.0.5)
+      sexp_processor (~> 3.0)
+    rubyzip (0.9.4)
+    sexp_processor (3.0.5)
+    shoulda (2.11.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  archive-tar-minitar (= 0.5.2)
+  bundler (>= 0.9.19)
+  flay
+  flog
+  heckle
+  mocha
+  open4 (>= 0.9.6)
+  rake (>= 0.8.7)
+  rcov
+  rdoc (>= 2.5.8)
+  rubyzip (= 0.9.4)
+  shoulda

data/lib/sprout/file_target.rb

@@ -27,6 +27,14 @@ module Sprout
       yield self if block_given?
     end
 
+    ##
+    # This is a template method that will be called
+    # so that RemoteFileTarget subclasses and load
+    # the appropriate files at the appropriate time.
+    # Admittedly kind of smelly, other ideas welcome...
+    def resolve
+    end
+
     ##
     # Add a library to the RubyGem package.
     # 
@@ -39,11 +47,11 @@ module Sprout
     # 
     def add_library name, path
       if path.is_a?(Array)
-        path = path.collect { |p| expand_executable_path(p) }
+        path = path.collect { |p| expand_local_path(p) }
       else
-        path = expand_executable_path path
+        path = expand_local_path path
       end
-      libraries << Sprout::Library.new( :name => name, :path => path, :file_target => self )
+      libraries << OpenStruct.new( :name => name, :path => path, :file_target => self )
     end
 
     ##
@@ -54,7 +62,7 @@ module Sprout
     # with this name.
     #
     def add_executable name, path
-      path = expand_executable_path path
+      path = expand_local_path path
       executables << OpenStruct.new( :name => name, :path => path, :file_target => self )
     end
 
@@ -67,7 +75,10 @@ module Sprout
       raise Sprout::Errors::UsageError.new "FileTarget.pkg_version is required" if pkg_version.nil?
     end
 
-    def expand_executable_path path
+    ## 
+    # This is a template method that is overridden
+    # by RemoteFileTarget.
+    def expand_local_path path
       File.join load_path, path
     end
 

data/lib/sprout/library.rb

@@ -11,6 +11,7 @@ module Sprout
     attr_accessor :path
     attr_accessor :pkg_name
     attr_accessor :pkg_version
+    attr_accessor :platform
 
     class << self
       ##

data/lib/sprout/remote_file_loader.rb

@@ -17,7 +17,7 @@ module Sprout
         begin
           return open_uri uri, display_name
         rescue SocketError => sock_err
-          raise Sprout::Errors::RemoteFileLoaderError.new("[ERROR] #{sock_err.to_s}")
+          raise Sprout::Errors::RemoteFileLoaderError.new("[ERROR] Failed to load file from: '#{uri.to_s}' - Please check that your machine has a connection to the internet.\n[REMOTE ERROR] #{sock_err.to_s}")
         rescue OpenURI::HTTPError => http_err
           raise Sprout::Errors::RemoteFileLoaderError.new("[ERROR] Failed to load file from: '#{uri.to_s}'\n[REMOTE ERROR] #{http_err.io.read.strip}")
         rescue Errno::ECONNREFUSED => econ_err

data/lib/sprout/remote_file_target.rb

@@ -23,10 +23,7 @@ module Sprout
 
     protected
 
-    def expand_executable_path path
-      # TODO: This is failing b/c it gets called before
-      # we can set pkg_name and pkg_version - so join 
-      # raises null pointer error.
+    def expand_local_path path
       File.join unpacked_file, path
     end
 

data/lib/sprout/ruby_feature.rb

@@ -76,6 +76,8 @@ module Sprout
           message << "to update your local gems.\n\n"
           raise Sprout::Errors::LoadError.new message
         end
+
+        resolve_file_target entity
         entity
       end
 
@@ -85,6 +87,17 @@ module Sprout
 
       protected
 
+      def resolve_file_target entity
+        if(entity.respond_to? :resolve)
+          entity.resolve
+        elsif(entity.respond_to? :file_target)
+          file_target = entity.file_target
+          if(file_target.respond_to? :resolve)
+            file_target.resolve
+          end
+        end
+      end
+
       def validate_registration entity
         if(!entity.respond_to?(:name) || entity.name.nil?)
           raise Sprout::Errors::UsageError.new "Cannot register a RubyFeature without a 'name' getter"
@@ -103,7 +116,7 @@ module Sprout
         #puts "+++++++++++++++++++++++++++"
         #puts ">> entity_for #{name_or_names} pkg_name: #{pkg_name} version: #{version_requirement}"
         #registered_entities.each do |entity|
-          #puts ">> entity: #{entity.name} pkg_name: #{entity.pkg_name} version: #{entity.pkg_version}"
+          #puts ">> entity: #{entity.name} platform: #{entity.platform} pkg_name: #{entity.pkg_name} version: #{entity.pkg_version}"
         #end
         registered_entities.reverse.select do |entity|
             satisfies_name?(entity, name_or_names) && 
@@ -134,6 +147,7 @@ module Sprout
 
       def satisfies_platform? entity
         #puts">> satisfies platform?"
+        # If not platform is defined, it's assumed to work on all platforms:
         return true if !entity.respond_to?(:platform) || entity.platform.nil?
         #puts ">> platform: #{entity.platform}"
         Sprout.current_system.can_execute?(entity.platform)

data/lib/sprout/specification.rb

@@ -135,11 +135,8 @@ module Sprout
     # If the archive has not been downloaded, it will be downloaded, unpacked
     # and the path to the requested executable will be returned.
     def add_remote_file_target &block
-      target = RemoteFileTarget.new do |t|
-        configure_target t, &block
-      end
-      target.resolve
-      register_file_target target
+      target = RemoteFileTarget.new
+      configure_target target, &block
     end
 
     # Add a file to the RubyGem itself. This is a great way to package smallish libraries in either
@@ -157,10 +154,8 @@ module Sprout
     #     end
     #
     def add_file_target &block
-      target = FileTarget.new do |t|
-        configure_target t, &block
-      end
-      register_file_target target
+      target = FileTarget.new
+      configure_target target, &block
     end
 
     private
@@ -170,9 +165,10 @@ module Sprout
       t.pkg_name    = name
       t.pkg_version = version
       yield t if block_given?
+      register_file_target_libs_and_exes t
     end
 
-    def register_file_target target
+    def register_file_target_libs_and_exes target
       register_items target.executables, Sprout::Executable, target
       # Reversing the libraries makes it so that definitions like:
       #
@@ -184,11 +180,13 @@ module Sprout
       register_items target.libraries, Sprout::Library, target
     end
 
-    def register_items collection, source, target
-      collection.each do |item|
-        item.pkg_name    = target.pkg_name
-        item.pkg_version = target.pkg_version
-        source.register item
+    def register_items collection, ruby_feature, target
+      collection.each do |exe_or_lib|
+        exe_or_lib.pkg_name    = target.pkg_name
+        exe_or_lib.pkg_version = target.pkg_version
+        exe_or_lib.platform    = target.platform
+        exe_or_lib.file_target = target
+        ruby_feature.register exe_or_lib
       end
     end
 

data/lib/sprout/test/sprout_test_case.rb

@@ -140,7 +140,7 @@ module SproutTestCase # :nodoc:[all]
     # Ugh - This is way too greedy... We're killing all mocks in here
     # Doing it anyway b/c we need to get Windows support in place...
     # TODO: Implement this feature without clobbering all stubs/mocks
-    Mocha::Mockery.instance.teardown
+    #Mocha::Mockery.instance.teardown
   end
 
   def as_a_mac_system
@@ -150,7 +150,7 @@ module SproutTestCase # :nodoc:[all]
     # Ugh - This is way too greedy... We're killing all mocks in here
     # Doing it anyway b/c we need to get Windows support in place...
     # TODO: Implement this feature without clobbering all stubs/mocks
-    Mocha::Mockery.instance.teardown
+    #Mocha::Mockery.instance.teardown
   end
   
   def as_a_windows_system
@@ -160,7 +160,17 @@ module SproutTestCase # :nodoc:[all]
     # Ugh - This is way too greedy... We're killing all mocks in here
     # Doing it anyway b/c we need to get Windows support in place...
     # TODO: Implement this feature without clobbering all stubs/mocks
-    Mocha::Mockery.instance.teardown
+    #Mocha::Mockery.instance.teardown
+  end
+
+  def as_a_win_nix_system
+    sys = Sprout::System::WinNixSystem.new
+    Sprout::System.stubs(:create).returns sys
+    yield sys if block_given?
+    # Ugh - This is way too greedy... We're killing all mocks in here
+    # Doing it anyway b/c we need to get Windows support in place...
+    # TODO: Implement this feature without clobbering all stubs/mocks
+    #Mocha::Mockery.instance.teardown
   end
 
   
@@ -217,5 +227,5 @@ end
 
 # Prevent log messages from interrupting the test output:
 Sprout::Log.debug = true
-Sprout::ProgressBar.debug = true
+#Sprout::ProgressBar.debug = true
 

data/lib/sprout/version.rb

@@ -6,7 +6,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 1
       MINOR = 0
-      TINY  = 29
+      TINY  = 31
       RELEASE = 'pre'
 
       STRING = [MAJOR, MINOR, TINY, RELEASE].join('.')

data/test/unit/ruby_feature_test.rb

@@ -41,8 +41,22 @@ class RubyFeatureTest < Test::Unit::TestCase
       end
     end
 
+    should "not call resolve on register" do
+      plugin = FakePlugin.new({:name => :foo2})
+      plugin.expects(:resolve).never
+      FakePlugin.register plugin
+    end
+
+    should "call resolve on load" do
+      plugin = FakePlugin.new({:name => :foo2})
+      FakePlugin.register plugin
+
+      plugin.expects(:resolve)
+      FakePlugin.load :foo2
+    end
+
     should "allow registration and load without ruby package or version" do
-      FakePlugin.register OpenStruct.new({:name => :foo2})
+      FakePlugin.register FakePlugin.new({:name => :foo2})
       assert_not_nil FakePlugin.load :foo2
     end
 
@@ -68,12 +82,12 @@ class RubyFeatureTest < Test::Unit::TestCase
     end
 
     should "load when request is a string" do
-      FakePlugin.register(OpenStruct.new({:name => :foo3}))
+      FakePlugin.register(FakePlugin.new({:name => :foo3}))
       assert_not_nil FakePlugin.load 'foo3'
     end
 
     should "load when registration is a string" do
-      FakePlugin.register(OpenStruct.new({:name => :swc, :pkg_name => 'asunit4'}))
+      FakePlugin.register(FakePlugin.new({:name => :swc, :pkg_name => 'asunit4'}))
       assert_not_nil FakePlugin.load nil, :asunit4
     end
 
@@ -91,13 +105,32 @@ class RubyFeatureTest < Test::Unit::TestCase
 
     should "find platform-specific remote file target" do
       osx = create_item(:platform => :osx)
+      windows = create_item(:platform => :windows)
       linux = create_item(:platform => :linux)
+
       FakePlugin.register osx
+      FakePlugin.register windows
       FakePlugin.register linux
+
       as_a_mac_system do
         result = FakePlugin.load :foo
         assert_equal osx, result
       end
+
+      as_a_windows_system do
+        result = FakePlugin.load :foo
+        assert_equal windows, result
+      end
+
+      as_a_win_nix_system do
+        result = FakePlugin.load :foo
+        assert_equal windows, result
+      end
+
+      as_a_unix_system do
+        result = FakePlugin.load :foo
+        assert_equal linux, result
+      end
     end
 
   end
@@ -105,11 +138,16 @@ class RubyFeatureTest < Test::Unit::TestCase
   private
 
   def create_item options={}
-    OpenStruct.new({:name => :foo, :pkg_name => 'sprout/base', :pkg_version => '1.0.pre', :platform => :universal}.merge(options))
+    FakePlugin.new({:name => :foo, :pkg_name => 'sprout/base', :pkg_version => '1.0.pre', :platform => :universal}.merge(options))
   end
 
-  class FakePlugin
+  class FakePlugin < OpenStruct
     include Sprout::RubyFeature
+
+    ##
+    # Implement resolve like RemoteFileTargets..
+    def resolve
+    end
   end
 
   class OtherFakePlugin

data/test/unit/specification_test.rb

@@ -24,13 +24,29 @@ class SpecificationTest < Test::Unit::TestCase
         @spec.version = '1.0.pre'
       end
 
-      should "register executables" do
+      should "register executables with file_target reference" do
         @spec.add_file_target do |t|
           t.add_executable :foo, 'bin/foo'
         end
 
         Sprout::Executable.stubs :require_ruby_package
-        assert_not_nil Sprout::Executable.load :foo, 'foo_sdk', '1.0.pre'
+        exe = Sprout::Executable.load :foo, 'foo_sdk', '1.0.pre'
+        assert_equal Sprout::FileTarget, exe.file_target.class
+      end
+
+      should "register executable with remote_file_target instances" do
+        @spec.add_remote_file_target do |t|
+          t.url = 'http://www.example.com'
+          t.md5 = 'abcd'
+          t.archive_type = :zip
+          t.add_executable :foo, 'bin/foo'
+        end
+
+        Sprout::RemoteFileTarget.any_instance.stubs :resolve
+        Sprout::Executable.stubs :require_ruby_package
+        exe = Sprout::Executable.load :foo, 'foo_sdk', '1.0.pre'
+        assert_equal Sprout::RemoteFileTarget, exe.file_target.class
+        assert exe.path =~ /cache/, "RemoteFileTarget local path should include Sprout CACHE directory"
       end
 
       should "load returns libraries in expected order" do
@@ -43,11 +59,92 @@ class SpecificationTest < Test::Unit::TestCase
         library = Sprout::Library.load nil, 'foo_sdk'
         assert_equal 'foo', File.basename(library.path)
       end
-
      
     end
   end
 
+  context "a platform-specific, remote executable specification" do
+
+    setup do
+      @spec = Sprout::Specification.new do |s|
+        s.name = 'fake_flashplayer_spec'
+        s.version = '10.1.53'
+
+        s.add_remote_file_target do |t|
+          t.platform     = :windows
+          t.add_executable :fake_flashplayer, "flashplayer_10_sa_debug.exe"
+        end
+
+        s.add_remote_file_target do |t|
+          t.platform     = :osx
+          t.add_executable :fake_flashplayer, "Flash Player Debugger.app"
+        end
+
+        s.add_remote_file_target do |t|
+          t.platform     = :linux
+          t.add_executable :fake_flashplayer, "flashplayerdebugger"
+        end
+      end
+
+    end
+
+    should "be resolved for Windows systems" do
+      Sprout::RemoteFileTarget.any_instance.expects(:resolve)
+      as_a_windows_system do
+        target = Sprout::Executable.load 'fake_flashplayer'
+        assert_equal :windows, target.platform
+      end
+    end
+
+    should "be resolved for OSX systems" do
+      Sprout::RemoteFileTarget.any_instance.expects(:resolve)
+      as_a_mac_system do
+        target = Sprout::Executable.load 'fake_flashplayer'
+        assert_equal :osx, target.platform
+      end
+    end
+
+    should "be resolved for Unix systems" do
+      Sprout::RemoteFileTarget.any_instance.expects(:resolve)
+      as_a_unix_system do
+        target = Sprout::Executable.load 'fake_flashplayer'
+        assert_equal :linux, target.platform
+      end
+    end
+  end
+
+  context "a universal collection of executables" do
+
+    setup do
+      @spec = Sprout::Specification.new do |s|
+        s.name    = 'flex4'
+        s.version = '4.0.pre'
+
+        s.add_remote_file_target do |t|
+          # Apply the windows-specific configuration:
+          t.platform = :universal
+          # Apply the shared platform configuration:
+          # Remote Archive:
+          t.archive_type = :zip
+          t.url          = "http://download.macromedia.com/pub/labs/flex/4/flex4sdk_b2_100509.zip"
+          t.md5          = "6a0838c5cb33145fe88933778ddb966d"
+
+          # Executables: (add .exe suffix if it was passed in)
+          t.add_executable :compc,      "bin/compc"
+          t.add_executable :fcsh,       "bin/fcsh"
+          t.add_executable :fdb,        "bin/fdb"
+          t.add_executable :mxmlc,      "bin/mxmlc"
+        end
+      end
+
+    end
+
+    should "make binaries available" do
+      mxmlc = Sprout::Executable.load :mxmlc
+      assert_not_nil mxmlc
+    end
+  end
+
   context "a newly included executable" do
     setup do
       @echo_chamber = File.join fixtures, 'executable', 'echochamber_gem', 'echo_chamber'

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 29
+  - 31
   - pre
-  version: 1.0.29.pre
+  version: 1.0.31.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 -07:00
+date: 2010-10-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -209,6 +209,7 @@ files:
 - bin/sprout-test
 - bin/sprout-tool
 - Gemfile
+- Gemfile.lock
 - lib/sprout/archive_unpacker.rb
 - lib/sprout/base.rb
 - lib/sprout/concern.rb