sproutcore 1.6.0.beta.3-java → 1.6.0-java

data/CHANGELOG

@@ -1,3 +1,73 @@
+*SproutCore 1.6.0 (June 09, 2011)*
+
+* Code cleanup +  Stream the headers and body directly across the proxy as they arrive, which will work with streaming APIs like Twitter
+* Merge pull request #53 from publickeating/master
+* Fixed variable typo
+* Rewritten to make the proxy non-blocking.   Probably needs some real-world hardening.
+* Added sc_static support to handlebars and did some test cleanup
+* Should fix broken module building - Fixes #58
+* Fixed sc-docs warning
+* Switch absolute_path to expand_path for Ruby 1.8 compatibility
+* Bumped RSpec Dependency
+
+*SproutCore 1.6.0.rc.2 (May 23, 2011)*
+
+* Allow for absolute build_prefix
+* We don't need to split for windows
+* Fixed language generator - Fixes #44
+* Fixed CLI --target flag
+* Makes code less readable is more like it!
+* We don't need this hack anymore
+* simplified ruby compatibility code in lib/sproutcore.rb
+* Soften dependencies to allow use SproutCore in Rails 3.1
+* Don't hash SCSS paths after all, instead santize
+* Don't need a check, the gem requires haml
+* Compass requires chunky_png
+* cleaned up a few return calls on methods of helpers/text_helper
+* refactored textilize method in helpers/text_helper
+* refactored textilize_without_paragraph method in helpers/text_helper
+* Removed documentation tools, use sc-docs gem instead
+* Fixed issue with default load files that broke modules
+* Fixes to README
+* Fixed the renamed History.txt and README.txt (to *.rdoc) in the Gemspec.
+* Suffix History and Todo with .rdoc
+* Renamed the README so that it displays nice on Github
+* refactored do_misc method on helpers/cssmin
+* Removed Rake release nopush option
+* refactored shorten_colors method on helpers/cssmin
+* refactored remove_spaces method on helpers/cssmin
+* remove #replace_ext
+* When the host or the port has changed, we should really redirect
+* redefine the headers['Host'] every time
+* removing the port from the address breaks any redirect which is not on port 80
+
+*SproutCore 1.6.0.rc.1 (May 16, 2011)*
+
+* More Rakefile improvements
+* Real changelog tasks
+* Added get_allowed_keys to DRY up the retrieval of options
+* DRY up the init task
+* Added in sc-build args that were in documentation but not implemented - Fixes #429
+* Added copyright_block method to centralize template copyright generation
+* Commited missing fixtures for tests
+* Handle SCRIPT_NAME properly when sproutcore server is mounted
+* Fixed test name typos
+* Try to load APP_NAME.js in addition to core.js - Fixes #413
+* Updated haml and compass dependencies
+* Fixed issue where the javascript building got in a fight with the YUI compressor (I think). See http://i.imgur.com/xbxGO.png.
+* Less noisy RSpec
+* Rakefile release task
+* Add handlebars files to the entries
+* fixed bug in the require of generated models
+* Adding touch_enabled flag to avoid having the touch icons included (default is still true)
+* Correct behavior of sc_require in Chance.
+* Made modules SC.Objects instead of just hashes
+* Fix to chance to avoid a Windows error
+* Change jQuery.ready() to SC.ready() in HTML template, which allows SC.RootResponder to attach event listeners before the app runs.
+* Changed the generators so they create more descriptive names. Before, we had lots of files with the same name, which was confusing in editors and in the webkit inspector. This solves that problem.
+* Adding timestamp to sc-build logger, thanks Tony Sung
+
+
 *SproutCore 1.6.0.beta.3 (May 10, 2011)*
 
 * Fixed framework issues that cause sc-build to fail

data/{README.txt → README.rdoc}

@@ -1,7 +1,8 @@
-sproutcore - abbot
+= sproutcore - abbot
+
     by Charles Jolley and contributors
     http://www.sproutcore.com
-    http://github.com/sproutit/sproutcore-abbot
+    http://github.com/sproutcore/sproutcore-abbot
 
 == DESCRIPTION:
 

data/Rakefile

@@ -25,15 +25,16 @@ To get the SproutCore framework, run
 To update the gem:
 
   - Update VERSION.yml
-  - Update CHANGELOG
-  - Make sure the framework is up to date
-  - Add a new tag
-  - Build and push the gem:
-      gem build sproutcore.gemspec
-      gem push sproutcore-VERSION.gem
-  - Switch to JRuby and repeat:
-      gem build sproutcore.gemspec
-      gem push sproutcore-VERSION-java.gem
+  - Run `rake release:prepare` on Mac OS X or Linux
+      This updates the CHANGELOGS for both framework and abbot,
+      updates version numbers and tags them. It also builds and
+      pushes gems. If you just want to see what it does, pass
+      PRETEND=1 to make no actual changes.
+      For best results you should have RVM with MRI Ruby and JRuby installed.
+  - Once you have verified your changes, run `rake release:deploy`.
+  - On Windows, update the repos and run `rake release:gems:deploy`
+  - To create installer packages, run `rake pkg` on Mac OS X and Windows
+
 END
 
 end
@@ -42,7 +43,9 @@ begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new
 rescue LoadError
-  puts "RSpec is not installed. Please install if you want to run tests."
+  if Rake.application.options.show_tasks
+    puts "RSpec is not installed. Please install if you want to run tests."
+  end
 end
 
 begin
@@ -60,3 +63,203 @@ rescue LoadError
     puts "`gem install packager` for packaging tasks"
   end
 end
+
+### RELEASE TASKS ###
+
+rvm_data = `rvm list` rescue nil
+rvm_versions = rvm_data ? rvm_data.split("\n")[3..-1].map{|l| l[3..-1].split(" ")[0] } : []
+rvm_mri = rvm_versions.select{|v| v =~ /^ruby-/ }[-1]
+rvm_jruby = rvm_versions.select{|v| v =~ /^jruby-/ }[-1]
+
+version = SproutCore::VERSION
+
+namespace :release do
+
+  def pretend?
+    ENV['PRETEND']
+  end
+
+  namespace :framework do
+
+    task :chdir do
+      chdir File.expand_path('../lib/frameworks/sproutcore', __FILE__)
+    end
+
+    task :update do
+      branch = `git describe --contains --all HEAD`
+      puts "Checking out framework branch: #{branch}"
+      unless pretend?
+        Rake::Task["release:framework:chdir"].invoke
+        system "git checkout #{branch}"
+        system "git pull"
+      end
+    end
+
+    task :changelog => :chdir do
+      last_tag = `git describe --tags --abbrev=0`.strip
+      puts "Getting Changes since #{last_tag}"
+
+      cmd = "git log #{last_tag}..HEAD --format='* %s'"
+      puts cmd
+
+      changes = `#{cmd}`
+      output = "#{version}\n#{'-'*version.length}\n#{changes}\n"
+
+      unless pretend?
+        File.open('CHANGELOG.md', 'r+') do |file|
+          current = file.readlines
+          current.insert(3, output)
+          file.pos = 0;
+          file.puts current
+        end
+      else
+        puts output.split("\n").map!{|s| "    #{s}"}.join("\n")
+      end
+    end
+
+    task :update_references => :chdir do
+      puts "Updating version references to #{version}"
+
+      cmd = "sed -i '' \"s/@version .*/@version #{version}/\" frameworks/runtime/core.js"
+      pretend? ? puts(cmd) : system(cmd)
+
+      cmd = "sed -i '' \"s/SC.VERSION = .*/SC.VERSION = '#{version}';/\" frameworks/runtime/core.js"
+      pretend? ? puts(cmd) : system(cmd)
+    end
+
+    task :commit => :chdir do
+      puts "Commiting Version Bump"
+      unless pretend?
+        system "git reset"
+        system "git add CHANGELOG.md frameworks/runtime/core.js"
+        system "git commit -m 'Version bump - #{version}'"
+      end
+    end
+
+    task :tag => :chdir do
+      puts "Tagging REL-#{version}"
+      system "git tag REL-#{version}" unless pretend?
+    end
+
+    task :push => :chdir do
+      puts "Pushing Repo"
+      unless pretend?
+        print "Are you sure you want to push the framework repo to github? (y/N) "
+        res = STDIN.gets.chomp
+        if res == 'y'
+          system "git push"
+          system "git push --tags"
+        else
+          puts "Not Pushing"
+        end
+      end
+    end
+
+    task :prepare => [:update, :changelog, :update_references]
+    task :deploy => [:commit, :tag, :push]
+
+  end
+
+  namespace :abbot do
+
+    task :chdir do
+      chdir File.dirname(__FILE__)
+    end
+
+    task :update do
+      puts "Checking updating repo"
+      system "git pull" unless pretend?
+    end
+
+    task :changelog => :chdir do
+      last_tag = `git describe --tags --abbrev=0`.strip
+      puts "Getting Changes since #{last_tag}"
+
+      cmd = "git log #{last_tag}..HEAD --format='* %s'"
+      puts cmd
+
+      changes = `#{cmd}`
+      output = "*SproutCore #{version} (#{Time.now.strftime("%B %d, %Y")})*\n\n#{changes}\n"
+
+      unless pretend?
+        File.open('CHANGELOG', 'r+') do |file|
+          current = file.read
+          file.pos = 0;
+          file.puts output
+          file.puts current
+        end
+      else
+        puts output.split("\n").map!{|s| "    #{s}"}.join("\n")
+      end
+    end
+
+    task :commit => :chdir do
+      puts "Commiting Version Bump"
+      unless pretend?
+        system "git reset"
+        system "git add CHANGELOG VERSION.yml lib/frameworks/sproutcore"
+        system "git commit -m 'Version bump - #{version}'"
+      end
+    end
+
+    task :tag => :chdir do
+      puts "Tagging REL-#{version}"
+      system "git tag REL-#{version}" unless pretend?
+    end
+
+    task :push => :chdir do
+      puts "Pushing Repo"
+      unless pretend?
+        print "Are you sure you want to push the abbot repo to github? (y/N) "
+        res = STDIN.gets.chomp
+        if res == 'y'
+          system "git push"
+          system "git push --tags"
+        else
+          puts "Not Pushing"
+        end
+      end
+    end
+
+    task :prepare => [:update, :changelog]
+    task :deploy => [:commit, :tag, :push]
+
+  end
+
+  namespace :gems do
+
+    task :build do
+      versions = [rvm_mri, rvm_jruby].compact
+      unless versions.empty?
+        puts "Building for #{versions.join(", ")}"
+        system "rvm #{versions.join(',')} exec gem build sproutcore.gemspec" unless pretend?
+      else
+        puts "Building for current version"
+        system "gem build sproutcore.gemspec" unless pretend?
+      end
+    end
+
+    task :push do
+      Dir["sproutcore-#{version}*.gem"].each do |g|
+        puts "Pushing #{g}"
+        unless pretend?
+          print "Are you sure you want to push the gem to RubyGems.org? (y/N) "
+          res = STDIN.gets.chomp
+          if res == 'y'
+            system "gem push #{g}"
+          else
+            puts "Not Pushing"
+          end
+        end
+      end
+    end
+
+    task :prepare => []
+    task :deploy => [:build, :push]
+
+  end
+
+  task :prepare => ["framework:prepare", "abbot:prepare", "gems:prepare"]
+  task :deploy => ["framework:deploy", "abbot:deploy", "gems:deploy"]
+
+end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 6
-:patch: 0.beta.3
+:patch: 0

data/bin/sc-docs

@@ -9,6 +9,11 @@
 
 require "sproutcore"
 
-SC::Tools.invoke :docs
+begin
+  require 'sc_docs/cli'
+  ScDocs::CLI.start
+rescue LoadError
+  puts "sc-docs is no longer bundled with SproutCore. Please install the sc-docs tool instead."
+end
 
 # EOF

data/lib/Buildfile

@@ -102,7 +102,11 @@ mode :all do
     # Whether to generate an app.manifest file for HTML5 application caching
     :html5_manifest => false,
     # Which networks/URLs to allow if HTML5 application caching is turned on
-    :html5_manifest_networks => []
+    :html5_manifest_networks => [],
+    
+    # whether to include touch icons in the index.html and other touch related
+    # properties
+    :touch_enabled => true
     
 end
 

data/lib/buildtasks/manifest.rake

@@ -145,6 +145,9 @@ namespace :manifest do
         end
       end
 
+      # allow if it is a handlebars template
+      next if entry[:ext] == "handlebars"
+
       # otherwise, allow if inside lproj
       next if entry.localized? || entry[:filename] =~ /^.+\.lproj\/.+$/
 
@@ -602,7 +605,17 @@ namespace :manifest do
       # build combined JS entry
       javascript_entries.each do |resource_name, entries|
         resource_name = resource_name.ext('js')
-        pf = (resource_name == 'javascript.js') ? %w(source/lproj/strings.js source/core.js source/utils.js) : []
+
+        if resource_name == 'javascript.js'
+          pf = ['source/lproj/strings.js', 'source/core.js', 'source/utils.js']
+          if manifest.target.target_type == :app
+            target_name = manifest.target.target_name.to_s.split('/')[-1]
+            pf.insert(2, "source/#{target_name}.js")
+          end
+        else
+          pf = []
+        end
+
         manifest.add_composite resource_name,
           :build_task      => 'build:combine',
           :source_entries  => entries,

data/lib/buildtasks/target.rake

@@ -33,29 +33,26 @@ namespace :target do
       target[:index_root] = url
     end
 
-    url_prefix = config[:url_prefix]
-    url_prefix = url_prefix.gsub(/^[^\/]+:\/\/[^\/]+\//,'') if url_prefix
-
-    # Split all of these paths in case we are on windows...
-    target[:build_root] = File.expand_path(config[:build_root] ||
-      File.join(project.project_root.to_s,
-        (config[:build_prefix] || '').to_s.split('/'),
-        (url_prefix || '').to_s.split('/'),
-        target[:target_name].to_s.split('/')))
-
-
-    target[:staging_root] = File.expand_path(config[:staging_root] ||
-      File.join(project.project_root.to_s,
-        (config[:staging_prefix] || '').to_s.split('/'),
-        (url_prefix || '').to_s.split('/'),
-        target[:target_name].to_s))
-
-    # cache is used to store intermediate files
-    target[:cache_root] = File.expand_path(config[:cache_root] ||
-      File.join(project.project_root.to_s,
-        (config[:cache_prefix] || '').to_s.split('/'),
-        (url_prefix || '').to_s.split('/'),
-        target[:target_name].to_s))
+    url_prefix = (config[:url_prefix] || '').gsub(/^[^\/]+:\/\/[^\/]+\//,'')
+
+    # Set up root paths
+    %w(build staging cache).each do |type|
+      root_key = "#{type}_root".to_sym
+      root = config[root_key]
+      prefix = config["#{type}_prefix".to_sym]
+
+      path = root
+      unless path
+        base = prefix || ''
+        # Check if it's absolute, if not add project_root
+        unless base[0..0] == '~' || File.expand_path(base) == base
+          base = File.join((project.project_root || '').to_s, base)
+        end
+        path = File.join(base, url_prefix, (target[:target_name] || '').to_s)
+      end
+
+      target[root_key] = File.expand_path(path)
+    end
 
     target[:build_number] = target.compute_build_number
 

data/lib/frameworks/sproutcore/Buildfile

@@ -28,11 +28,12 @@ end
 config :bootstrap,  :required => [], :use_modules => false
 
 config :jquery,          :required => [], :test_required => [], :debug_required => []
+config :yuireset,        :required => [], :test_required => [], :debug_required => []
 config :handlebars,      :required => []
 config :runtime,         :required => [:jquery]
 config :'datetime/core', :required => [:runtime]
 config :datetime,        :required => [:'datetime/core']
-config :core_foundation, :required => [:runtime, :handlebars]
+config :core_foundation, :required => [:runtime, :handlebars, :yuireset]
 config :'datetime/localized', :required => [:core_foundation]
 config :routing,         :required => [:core_foundation]
 config :foundation,      :required => [:routing, :core_foundation, :datetime, :'datetime/localized', :ajax]
@@ -43,7 +44,7 @@ config :statechart,      :required => [:core_foundation], :test_required => [:co
 config :ajax,            :required => [:runtime, :core_foundation]
 
 # WRAPPER FRAMEWORKS
-config :sproutcore, :required => [:desktop, :datastore]
+config :sproutcore, :required => [:desktop, :datastore, :statechart]
 config :mini, :required => [:runtime, :datastore]
 config :animation, :required => :foundation
 
@@ -85,7 +86,11 @@ config :ace,
 # CONFIGURE APPS
 config :core_tools, :required => [
   :desktop, :datastore, :animation, "sproutcore/experimental/forms",
-  "sproutcore/ace", "sproutcore/experimental/split_view"
+  "sproutcore/ace",
+
+  # The SC apps will use the experimental version of these controls:
+  "sproutcore/experimental/select_view",
+  "sproutcore/experimental/split_view"
 ]
 
 # mode :debug do