sproutit-sproutcore 1.0.203 → 1.0.20090721145236

data/Rakefile

@@ -5,32 +5,56 @@
 #            and contributors
 # ===========================================================================
 
-# Rakefile used to build the SproutCore Gem.  Requires Jeweler to function.
-
-ROOT_PATH = File.dirname(__FILE__)
-
-# files to ignore changes in
-IGNORE_CHANGES = %w[.gitignore .gitmodules .DS_Store .gemspec VERSION.yml ^pkg ^tmp ^coverage]
+# This Rakefile is used to build and distribute the SproutCore Gem.  It
+# requires the "bones" gem to provide the rake tasks needed for release.
 
 ################################################
-## LOAD DEPENDENCIES
+## LOAD BONES
 ##
 begin
-  require 'jeweler'
-  require 'extlib'
+  require 'bones'
+  Bones.setup
+rescue LoadError
+  puts "WARN: bones gem is required to build SproutCore Gem"
+  #load 'tasks/setup.rb'
+end
 
-  $:.unshift(ROOT_PATH / 'lib')
-  require 'sproutcore'
+ensure_in_path 'lib'
+require 'sproutcore'
 
-rescue LoadError => e
-  $stderr.puts "WARN: some required gems are not installed (try rake init to setup)"
-end
+################################################
+## DEPENDENCIES
+##
 
+depend_on 'rack', '>= 0.9.1'
+depend_on 'json_pure', ">= 1.1.0"
+depend_on 'extlib', ">= 0.9.9"
+depend_on 'erubis', ">= 2.6.2"
 
 ################################################
 ## PROJECT DESCRIPTION
 ##
 
+task :default => 'spec:specdoc'
+
+PROJ.name = 'sproutcore'
+PROJ.authors = 'Sprout Systems, Inc.  Apple, Inc. and contributors'
+PROJ.email = 'contact@sproutcore.com'
+PROJ.url = 'http://www.sproutcore.com/sproutcore'
+PROJ.version = SC::VERSION
+PROJ.rubyforge.name = 'sproutcore'
+PROJ.ruby_opts = []
+PROJ.spec.opts << '--color'
+PROJ.exclude << '^coverage/' << '\.gitignore' << '\.gitmodules' << ".DS_Store"
+
+# For development builds add timestamp to the version number to auto-version 
+# development gems.
+PROJ.version += ".#{Time.now.strftime("%Y%m%d%H%M%S")}" if !ENV['VERSION'] 
+
+#VERSION = SC::VERSION
+
+require 'jeweler'
+
 Jeweler::Tasks.new do |gemspec|
   gemspec.name = 'sproutcore'
   gemspec.authors = 'Sprout Systems, Inc.  Apple, Inc. and contributors'
@@ -42,189 +66,30 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.add_dependency 'json_pure', ">= 1.1.0"
   gemspec.add_dependency 'extlib', ">= 0.9.9"
   gemspec.add_dependency 'erubis', ">= 2.6.2"
-  gemspec.add_development_dependency 'jeweler', ">= 1.0.1"
+  gemspec.add_development_dependency 'bones', ">= 2.5.1"
   gemspec.rubyforge_project = "sproutcore"
-  gemspec.files.include *%w[.htaccess lib/thor/**/* frameworks/sproutcore/**/*]
-  gemspec.files.exclude *%w[^coverage/ .gitignore .gitmodules .DS_Store tmp .hashinfo .svn .git]
-  
-  # Exclude as many files as possible to reduce the size of the gemspec
-  # working around a bug with github
-  gemspec.files.exclude *%w[spec .graffle frameworks/sproutcore/themes/standard_theme/Source]
-  gemspec.test_files.exclude *%w[spec]
+  gemspec.files.exclude *%w[^coverage/ .gitignore .gitmodules .DS_Store]
   
-  gemspec.extra_rdoc_files.include *%w[History.txt README.txt]
-  
-  #gemspec.description = File.read(ROOT_PATH / 'README.txt')
-end
+  #gemspec.rubyforge.name = 'sproutcore'
+  #gemspec.ruby_opts = []
+  #gemspec.spec.opts << '--color'
+  #gemspec.exclude << '^coverage/' << '\.gitignore' << '\.gitmodules' << ".DS_Store"
 
-################################################
-## CORE TASKS
-##
-  
-desc "performs an initial setup on the tools.  Installs gems, init submodules"
-task :init do
-  $stdout.puts "Installing gems (may ask for password)"
-  `sudo gem install rack jeweler json_pure extlib erubis`
-  
-  $stdout.puts "Setup submodules"
-  `git submodule update --init`
+  # For development builds add timestamp to the version number to auto-version 
+  # development gems.
 end
-
-desc "computes the current hash of the code.  used to autodetect build changes"
-task :hash_content do
-  
-  require 'yaml'
-  require 'digest/md5'
-
-  ignore = IGNORE_CHANGES.map do |x| 
-    if x =~ /^\^/
-      /^#{Regexp.escape(ROOT_PATH / x[1..-1])}/
-    else
-      /#{Regexp.escape(x)}/
-    end
-  end
-
-  # First, get the hashinfo if it exists.  use this to decide if we need to
-  # rehash
-  hashinfo_path = ROOT_PATH / '.hashinfo.yml'
-  hash_date = 0
-  hash_digest = nil
-  
-  if File.exist?(hashinfo_path)
-    yaml = YAML.load_file(hashinfo_path)
-    hash_date = yaml['date'] || yaml[:date] || hash_date
-    hash_digest = yaml['digest'] || yaml[:digest] || hash_digest
-  end
-  
-  # paths to search  
-  paths = Dir.glob(File.join(ROOT_PATH, '**', '*')).reject do |path|
-    File.directory?(path) || (ignore.find { |i| path =~ i })
-  end
   
-  cur_date = 0
-  paths.each do |path|
-    mtime = File.mtime(path)
-    mtime = mtime.nil? ? 0 : mtime.to_i
-    puts "detected file change: #{path.gsub(ROOT_PATH,'')}" if mtime > hash_date
-    cur_date = mtime if mtime > cur_date
-  end
-  
-  if hash_digest.nil? || (cur_date != hash_date) 
-    digests = paths.map do |path|
-      Digest::SHA1.hexdigest(File.read(path))
-    end
-    digests.compact!
-    hash_digest = Digest::SHA1.hexdigest(digests.join)
-  end
-  hash_date = cur_date
-  
-  # write cache
-  File.open(hashinfo_path, 'w+') do |f|
-    YAML.dump({ :date => hash_date, :digest => hash_digest }, f)
-  end
-
-  # finally set the hash
-  CONTENT_HASH = hash_digest
-  puts "CONTENT_HASH = #{CONTENT_HASH}"
-end
-  
-desc "updates the VERSION file, bumbing the build rev if the current commit has changed"
-task :update_version => 'hash_content' do
-
-  path = ROOT_PATH / 'VERSION.yml'
- 
-  require 'yaml'
- 
-  # first, load the current yaml if possible
-  major = 1
-  minor = 0
-  build = 99
-  rev   = '-0-'
-  
-  if File.exist?(path)
-    yaml = YAML.load_file(path)
-    major = yaml['major'] || yaml[:major] || major
-    minor = yaml['minor'] || yaml[:minor] || minor
-    build = yaml['patch'] || yaml[:patch] || build
-    rev   = yaml['digest'] || yaml[:digest] || rev
-  end
- 
-  build += 1 if rev != CONTENT_HASH  #increment if needed
-  rev = CONTENT_HASH
-  
-  puts "write version #{[major, minor, build].join('.')} => #{path}"
-  File.open(path, 'w+') do |f|
-    YAML.dump({ 
-      :major => major, :minor => minor, :patch => build, :digest => rev 
-    }, f)
-  end
-end
-
-def fixup_gemspec
-  from_path = ROOT_PATH / 'sproutcore.gemspec'
-  to_path = ROOT_PATH / 'sproutcore-abbot.gemspec'
-  
-  if File.exists?(from_path)
-    FileUtils.rm(to_path) if File.exists?(to_path)
-    FileUtils.cp(from_path, to_path)
-  end
-end
-
-# Extend install to cleanup the generate and cleanup the gemspec afterwards
-task :build => 'gemspec:generate' do
-  fixup_gemspec
-end
-
-task "gemspec:generate" => 'git:verify_clean'
-
-# Extend gemspec to rename afterware
-task :gemspec do
-  
-  fixup_gemspec
-end
-
-desc "cleanup the pkg dir" 
-task :clean do
-  path = ROOT_PATH / 'pkg'
-  FileUtils.rm_r(path) if File.directory?(path)
-  `rm #{ROOT_PATH / '*.gem'}`
-end
-
-namespace :git do
-  
-  desc "verifies there are no pending changes to commit to git"
-  task :verify_clean do
-    %w(abbot frameworks/sproutcore lib/thor).each do |repo_name|
-      if repo_name == 'abbot'
-        path = ROOT_PATH
-      else
-        path = File.join(repo_name.split('/').unshift(ROOT_PATH))
-      end
-
-      result = `cd #{path}; git status`
-      if !(result =~ /nothing to commit \(working directory clean\)/)
-        $stderr.puts "\nFATAL: Cannot complete task: changes are still pending in the '#{repo_name}' repository."
-        $stderr.puts "       Commit your changes to git to continue.\n\n"
-        exit(1)
-      end
-    end
-  end
+task :write_version do
+  path = File.join(File.dirname(__FILE__), 'VERSION')
+  puts "write version => #{path}"
+  f = File.open(path, 'w')
   
-  desc "Collects the current SHA1 commit hash into COMMIT_ID"
-  task :collect_commit do
-    log = `git log HEAD^..HEAD`
-    COMMIT_ID = log.split("\n").first.match(/commit ([\w]+)/).to_a[1]
-    if COMMIT_ID.empty?
-      $stderr.puts "\nFATAL: Cannot discover current commit id"
-      exit(1)
-    else
-      $stdout.puts "COMMIT_ID = #{COMMIT_ID}"
-    end
-  end
+  version = ENV['VERSION'] || "#{SC::VERSION}.#{Time.now.strftime("%Y%m%d%H%M%S")}" 
   
+  f.write(version)
+  f.close
 end
 
-# Write a new version everytime we generate
-task 'gemspec:generate' => :update_version
+task 'gemspec:generate' => :write_version
 
 # EOF

data/VERSION

@@ -0,0 +1 @@
+1.0.20090721145236

data/lib/sproutcore/tools/build.rb

@@ -29,7 +29,7 @@ module SC
       end
       
       # Get the manifests to build
-      manifests = build_manifests(*targets)
+      manifests = build_manifests(targets)
 
       # First clean all manifests
       # Do this before building so we don't accidentally erase already build

data/lib/sproutcore.rb

@@ -7,7 +7,6 @@
 require 'rubygems'
 require 'logger'
 require 'extlib'
-require 'yaml'
 
 $KCODE = 'u'
 require 'jcode'
@@ -16,18 +15,12 @@ require 'jcode'
 YES = true
 NO = false
 
-
 module SproutCore
 
   # :stopdoc:
+  VERSION = '1.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-  
-  VERSION_PATH = PATH / 'VERSION.yml'
-  VERSION_INFO = YAML.load_file(VERSION_PATH)
-  
-  VERSION = [VERSION_INFO[:major], VERSION_INFO[:minor], VERSION_INFO[:patch]].join('.')
-  
   # :startdoc:
 
   # Returns the version string for the library.
@@ -129,7 +122,6 @@ end  # module SC
 
 SC = SproutCore # alias
 
-
 SC.require_all_libs_relative_to(__FILE__)
 %w(buildfile models helpers deprecated builders render_engines tools rack).each do |dir|
   SC.require_all_libs_relative_to(__FILE__, ['sproutcore', dir])

data/spec/buildtasks/build/copy_spec.rb

@@ -0,0 +1,60 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe "build:copy" do
+  
+  include SC::SpecHelpers
+  include SC::BuildSpecHelpers
+  
+  before do
+    std_before
+    @task_name = 'build:copy'
+
+    @entry = @manifest.entry_for('demo.html')
+    @src_path = @entry.source_path
+    @dst_path = @entry.build_path
+    
+    @entry.build_task.should == 'build:copy' # precondition
+  end
+
+  after do
+    std_after
+  end
+  
+  it "copies from source to dst_path if dst_path does not exist" do
+    File.exist?(@dst_path).should be_false # precondition
+    
+    run_task @entry, @dst_path
+    files_eql(@src_path, @dst_path).should be_true
+  end
+  
+  it "does not run if newer file exists at dst_path" do
+    write_dummy(@dst_path)
+    make_newer(@dst_path, @src_path)
+    
+    run_task
+    
+    is_dummy(@dst_path).should be_true # make sure task did not copy
+  end
+
+  it "replaces dst_path if older file exists at dst_path" do
+    write_dummy(@dst_path)
+    make_newer(@src_path, @dst_path)
+    
+    run_task
+    
+    is_dummy(@dst_path).should be_false # should overrwite older file
+    files_eql(@src_path, @dst_path).should be_true
+  end
+  
+  it "does not run if dst_path == src_path" do
+    task = @buildfile.lookup('build:copy')
+    expected_count = task.execute_count
+    
+    @dst_path = @src_path
+    run_task
+    
+    task.execute_count.should == expected_count # did not execute!
+  end
+  
+  
+end

data/spec/buildtasks/build/spec_helper.rb

@@ -0,0 +1,36 @@
+require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
+
+module SC::BuildSpecHelpers
+  
+  def std_before
+    @project = temp_project :real_world
+    @target = @project.target_for :sproutcore
+    @buildfile = @target.buildfile
+    @manifest = @target.manifest_for(:language => :fr)
+    
+    @target.prepare! # make sure its ready for the manifest...
+    @manifest.build! # get a basic manifest good to go...
+  end
+  
+  def std_after
+    @project.cleanup
+  end
+  
+  def run_task(entry=nil, dst_path=nil)
+    entry ||= @entry
+    @buildfile.invoke @task_name,
+      :entry => entry,
+      :manifest => @manifest,
+      :target => @target,
+      :config => @target.config,
+      :project => @project,
+      :src_path => @src_path || entry.source_path,
+      :src_paths => @src_path.nil? ? entry.source_paths : [@src_path],
+      :dst_path => dst_path || @dst_path || entry.build_path
+  end
+
+  def entry_for(filename)
+    @manifest.entry_for filename, :hidden => true
+  end
+
+end

data/spec/buildtasks/manifest/catalog_spec.rb

@@ -0,0 +1,48 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe "manifest:catalog" do
+  
+  include SC::SpecHelpers
+  include SC::ManifestSpecHelpers
+  
+  before do
+    std_before
+  end
+  
+  def run_task
+    @manifest.prepare! # this should be run first...
+    super('manifest:catalog')
+  end
+  
+  it "create an entry for each item in the target regardless of language with the relative path as filename" do
+    run_task
+    
+    # collect filenames from target dir...
+    filenames = Dir.glob(File.join(@target.source_root, '**','*'))
+    filenames.reject! { |f| File.directory?(f) }
+    filenames.map! { |f| f.sub(@target.source_root + '/', '') }
+    filenames.reject! { |f| f =~ /^(apps|frameworks|themes)/ }
+          
+    entries = @manifest.entries.dup # get entries to test...
+    filenames.each do |filename|
+      entry = entries.find { |e| e.filename == filename }
+      if entry.nil?
+        nil.should == filename # oops!  not found...
+      else
+        entry.filename.should == filename
+        entry.build_task.should == 'build:copy'
+        entry.build_path.should == File.join(@manifest.build_root, filename)
+        entry.staging_path.should == File.join(@manifest.source_root, filename)
+        entry.source_path.should == entry.staging_path
+        entry.url.should == [@manifest.url_root, filename] * '/'
+        entry.should_not be_hidden
+        entry.original?.should be_true # mark as original entry
+      end
+        
+      (entry.nil? ? nil : entry.filename).should == filename
+      entries.delete entry
+    end
+    entries.size.should == 0
+  end
+  
+end

data/spec/buildtasks/manifest/hide_buildfiles_spec.rb

@@ -0,0 +1,125 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe "manifest:hide_buildfiles" do
+  
+  include SC::SpecHelpers
+  include SC::ManifestSpecHelpers
+  
+  before do
+    std_before
+  end
+
+    
+  def run_task
+    @manifest.prepare!
+    super('manifest:hide_buildfiles')
+  end
+  
+  it "should run manifest:catalog first" do
+    should_run('manifest:catalog') { run_task }
+  end
+  
+  it "should hide any Buildfile, sc-config, or sc-config.rb" do
+    run_task
+    entry_for('Buildfile').hidden?.should be_true
+  end
+  
+  it "should hide any non .js file outside of .lproj, test, fixture, & debug dirs" do
+    run_task
+    entry_for('README').hidden?.should be_true
+    entry_for('lib/index.html').hidden?.should be_true
+    
+    entry_for('tests/sample.rhtml').hidden?.should be_false
+    entry_for('english.lproj/demo.html').hidden?.should be_false
+    entry_for('fixtures/sample-json-fixture.json').hidden?.should be_false
+    entry_for('debug/debug-resource.html').hidden?.should be_false
+  end
+  
+  it "should NOT hide non-js files inslide lproj dirs" do
+    run_task
+    entry = entry_for('english.lproj/demo.html')
+    entry.should_not be_hidden
+  end
+
+  describe "CONFIG.load_fixtures" do
+    
+    it "should hide files in /fixtures and /*.lproj/fixtures if CONFIG.load_fixtures is false" do
+      @target.config.load_fixtures = false
+      run_task
+      entry = entry_for('fixtures/sample_fixtures.js')
+      entry.should be_hidden
+      entry = entry_for('english.lproj/fixtures/sample_fixtures-loc.js')
+      entry.should be_hidden
+    end
+  
+    it "should NOT hide files in /fixtures and /*.lproj/fixtures if CONFIG.load_fixtures is true" do
+      @target.config.load_fixtures = true
+      run_task
+      entry = entry_for('fixtures/sample_fixtures.js')
+      entry.should_not be_hidden
+      entry = entry_for('english.lproj/fixtures/sample_fixtures-loc.js')
+      entry.should_not be_hidden
+    end
+  end
+
+  describe "CONFIG.load_debug" do
+    it "should hide files in /debug and /*.lproj/debug if CONFIG.load_debug is false" do
+      @target.config.load_debug = false
+      run_task
+      entry = entry_for('debug/sample_debug.js')
+      entry.should be_hidden
+      entry = entry_for('english.lproj/debug/sample_debug-loc.js')
+      entry.should be_hidden
+    end
+  
+    it "should NOT hide files in /debug and /*.lproj/debug if CONFIG.load_fixtures is true" do
+      @target.config.load_debug = true
+      run_task
+      entry = entry_for('debug/sample_debug.js')
+      entry.should_not be_hidden
+      entry = entry_for('english.lproj/debug/sample_debug-loc.js')
+      entry.should_not be_hidden
+    end
+  end
+
+  describe "CONFIG.load_tests" do
+    it "should hide files in /tests and /*.lproj/tests if CONFIG.load_tests is false" do
+      @target.config.load_tests = false
+      run_task
+      entry = entry_for('tests/sample.js')
+      entry.should be_hidden
+      entry = entry_for('english.lproj/tests/sample-loc.js')
+      entry.should be_hidden
+    end
+  
+    it "should NOT hide files in /tests and /*.lproj/tests if CONFIG.load_tests is true" do
+      @target.config.load_tests = true
+      run_task
+      entry = entry_for('tests/sample.js')
+      entry.should_not be_hidden
+      entry = entry_for('english.lproj/tests/sample-loc.js')
+      entry.should_not be_hidden
+    end
+  end
+
+  describe "CONFIG.load_protocols" do
+    it "should hide files in /protocols and /*.lproj/protocols if config is false" do
+      @target.config.load_protocols = false
+      run_task
+      entry = entry_for('protocols/sample.js')
+      entry.should be_hidden
+      entry = entry_for('english.lproj/protocols/sample-loc.js')
+      entry.should be_hidden
+    end
+  
+    it "should NOT hide files in /protocols  and /*.lproj/protocols if config is true" do
+      @target.config.load_protocols = true
+      run_task
+      entry = entry_for('protocols/sample.js')
+      entry.should_not be_hidden
+      entry = entry_for('english.lproj/protocols/sample-loc.js')
+      entry.should_not be_hidden
+    end
+  end
+  
+end

data/spec/buildtasks/manifest/localize_spec.rb

@@ -0,0 +1,97 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe "manifest:localize" do
+  
+  include SC::SpecHelpers
+  include SC::ManifestSpecHelpers
+  
+  before do
+    std_before
+  end
+
+  def run_task
+    @manifest.prepare!
+    super('manifest:localize')
+  end
+  
+  it "should run manifest:catalog && hide_buildfiles as prereq" do
+    should_run('manifest:catalog') { run_task }
+    should_run('manifest:hide_buildfiles') { run_task }
+  end
+  
+  it "should not alter non-localized files" do
+    run_task
+    entry = entry_for('core.js')
+    entry.should_not be_nil
+    entry.should_not be_hidden
+  end
+
+  it "should mark all entries with localized? = true" do
+    run_task
+    @manifest.entries.each do |entry|
+      if entry.source_path =~ /\.lproj/
+        entry.localized?.should be_true
+      else
+        entry.localized?.should_not be_true
+      end
+    end
+  end
+  
+  it "should remove foo.lproj from filename, build_path, and url of localized except for css and js files, which get 'lproj' instead" do
+    run_task
+    @manifest.entries.each do |entry|
+      next unless entry.localized?
+      new_filename = entry.source_path.match(/\.lproj\/(.+)$/).to_a[1]
+      if entry.ext == 'js'
+        new_filename = "lproj/#{new_filename}"
+      end
+      
+      entry.filename.should eql(new_filename)
+      entry.build_path = File.join(@manifest.build_root, new_filename.split('/'))
+      entry.url = [@manifest.url_root, new_filename.split('/')].flatten.join('/')
+    end
+  end
+  
+  it "should assign language to localized entries" do
+    run_task
+    # we just test this by spot checking to make sure any entry in the
+    # french.lproj actually has a french language code assigned...
+    @manifest.entries.each do |entry|
+      next unless entry.localize? && (entry.source_path =~ /french\.lproj/)
+      entry.language.should eql(:fr) 
+    end
+  end
+      
+  it "should not hide resources in current language" do
+    run_task
+    entry = entry_for('lproj/french-resource.js')
+    entry.localized?.should be_true
+    entry.should_not be_hidden
+    entry.language.should eql(:fr)
+  end
+  
+  it "should not hide resource in preferred language that are not also found in current language" do
+    run_task
+    entry = entry_for('demo.html')
+    entry.localized?.should be_true
+    entry.language.should eql(:en)
+    entry.should_not be_hidden
+  end
+  
+  it "should prefer resource in current language over those in preferred language" do
+    run_task
+    # a 'strings.js' is defined in english.lproj, french.lproj, & german
+    # this should use the french version since that one is current
+    entry = @manifest.entry_for('lproj/strings.js')
+    entry.localized?.should be_true
+    entry.should_not be_hidden
+    entry.language.should eql(:fr)
+  end
+    
+  it "should hide resources in languages not part of current language or preferred language" do
+    run_task
+    entry = entry_for('lproj/german-resource.js')
+    entry.should be_hidden
+  end
+
+end