Rakefile in ruboto-1.0.3 vs Rakefile in ruboto-1.1.0

- old
+ new

@@ -151,12 +151,12 @@ milestone_name = issues[0] ? issues[0]['milestone']['title'] : "No issues for milestone #{milestone}" milestone_description = issues[0] ? issues[0]['milestone']['description'] : "No issues for milestone #{milestone}" milestone_description = milestone_description.split("\r\n").map(&:wrap).join("\r\n") categories = { 'Features' => 'feature', 'Bugfixes' => 'bug', - 'Documentation' => 'documentation', 'Support' => 'support', - 'Community' => 'community', + 'Performance' => 'performance', 'Documentation' => 'documentation', + 'Support' => 'support', 'Community' => 'community', 'Pull requests' => nil, 'Internal' => 'internal', 'Rejected' => 'rejected', 'Other' => nil } grouped_issues = issues.group_by do |i| labels = i['labels'].map { |l| l['name'] } @@ -231,14 +231,14 @@ New in version #{milestone_name}: #{milestone_description} #{(categories.keys & grouped_issues.keys).map do |cat| - "#{cat}:\n -#{grouped_issues[cat].map { |i| %Q{* Issue ##{i['number']} #{i['title'].gsub('`', "'")}}.wrap(2) }.join("\n")} + "#{cat}:\n +#{grouped_issues[cat].map { |i| %Q{* Issue ##{i['number']} #{i['title'].gsub('`', "'")}#{" (#{i['user']['login']})" if i['pull_request'] && i['pull_request']['html_url']}}.wrap(2) }.join("\n")} " -end.join("\n")} + end.join("\n")} You can find a complete list of issues here: * https://github.com/ruboto/ruboto/issues?state=closed&milestone=#{milestone} @@ -246,17 +246,17 @@ To use Ruboto, you need to install a Ruby implementation. Then do (possibly as root/administrator) gem install ruboto - ruboto setup + ruboto setup -y To create a project do ruboto gen app --package <your.package.name> cd <project directory> - ruboto setup + ruboto setup -y To run an emulator for your project cd <project directory> ruboto emulator @@ -424,11 +424,11 @@ task :project => PLATFORM_PROJECT file PLATFORM_PROJECT do sh "git clone --depth 1 https://github.com/ruboto/ruboto-core.git #{PLATFORM_PROJECT}" Dir.chdir PLATFORM_PROJECT do - sh "ruby -rubygems -I#{File.expand_path('lib', File.dirname(__FILE__))} ../../bin/ruboto update app" + sh "ruby -rubygems -I#{File.expand_path('lib', File.dirname(__FILE__))} ../../bin/ruboto update app --force" end end desc 'Generate a Ruboto Core platform debug apk' task :debug => PLATFORM_DEBUG_APK @@ -458,28 +458,30 @@ file PLATFORM_CURRENT_RELEASE_APK do FileUtils.mkdir_p File.dirname(PLATFORM_CURRENT_RELEASE_APK) puts 'Downloading the current RubotoCore platform release apk' uri = URI('https://raw.github.com/ruboto/ruboto.github.com/master/downloads/RubotoCore-release.apk') begin - Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https', - :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http| - headers = {'User-Agent' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; de-at) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10'} + headers = {'User-Agent' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; de-at) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10'} + catch :download_ok do loop do - response = http.get(uri.request_uri, headers) - if response.code == '200' - File.open(PLATFORM_CURRENT_RELEASE_APK, 'wb') { |f| f << response.body } - break - elsif response.code == '302' - headers.update('Referer' => uri.to_s) - if (cookie = response.response['set-cookie']) - headers.update('Cookie' => cookie) + Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https', + :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http| + response = http.get(uri.request_uri, headers) + if response.code == '200' + File.open(PLATFORM_CURRENT_RELEASE_APK, 'wb') { |f| f << response.body } + throw :download_ok + elsif response.code == '301' || response.code == '302' + headers.update('Referer' => uri.to_s) + if (cookie = response.response['set-cookie']) + headers.update('Cookie' => cookie) + end + uri = URI(response['location'].gsub(/^\//, 'http://ruboto.org/')) + puts "Following redirect to #{uri}." + else + puts "Got an unexpected response (#{response.code}). Retrying download." + puts response.inspect + sleep 1 end - uri = URI(response['location'].gsub(/^\//, 'http://ruboto.org/')) - puts "Following redirect to #{uri}." - else - puts "Got an unexpected response (#{response.code}). Retrying download." - puts response.inspect - sleep 1 end end end rescue Exception, SystemExit puts "Download failed: #{$!}"