Browse files

Better Packaging Scripts for working easier with Tokaido OS X App

  • Loading branch information...
1 parent 10e6ea4 commit ec3366f563759906daae08d7eea4589015676244 @androbtech androbtech committed Apr 23, 2015
Showing with 387 additions and 22 deletions.
  1. +0 −1 Scripts/{copy.sh → copy_tokaido_dependencies.sh}
  2. +6 −3 Scripts/gems.sh
  3. +27 −18 Scripts/package.sh
  4. +354 −0 Supplements/railties-4.2.1_app_base.rb
View
1 Scripts/copy.sh → Scripts/copy_tokaido_dependencies.sh
@@ -1,6 +1,5 @@
#!/bin/sh
-cp $TKD_TMP_PATH/$TKD_RUBY.zip Tokaido/Rubies/$TKD_RUBY.zip
cp $TKD_TMP_PATH/tokaido-gems.zip Tokaido/tokaido-gems.zip
cp $TKD_TMP_PATH/tokaido-bin.zip Tokaido/tokaido-bin.zip
cp $TKD_TMP_PATH/tokaido-bootstrap.zip Tokaido/tokaido-bootstrap.zip
View
9 Scripts/gems.sh
@@ -9,8 +9,10 @@ rm -rf gem_home
echo "Building new GEM_HOME"
mkdir -p $TKD_TMP_PATH/gem_home/ruby/$TKD_RUBY_NAMESPACE
-bundle config --local build.nokogiri --with-opt-dir=$(pkg-config iconv --variable=prefix)
-bundle config --local build.sqlite3 --with-opt-dir=$(pkg-config sqlite3 --variable=prefix)
+
+command -v pkg-config >/dev/null 2>&1 && bundle config --local build.nokogiri --with-opt-dir=$(pkg-config iconv --variable=prefix)
+command -v pkg-config >/dev/null 2>&1 && bundle config --local build.sqlite3 --with-opt-dir=$(pkg-config sqlite3 --variable=prefix)
+
bundle --path gem_home --gemfile Gemfile
gem install bundler -E --no-ri --no-rdoc -i gem_home/ruby/$TKD_RUBY_NAMESPACE
@@ -23,7 +25,8 @@ cd Gems
cp -R ../gem_home/ruby/$TKD_RUBY_NAMESPACE .
cd ..
mkdir -p Gems/supps
-cp $TKD_EXTENSIONS_PATH/railties-4.2.0_app_base.rb Gems/$TKD_RUBY_NAMESPACE/gems/railties-4.2.0/lib/rails/generators/app_base.rb
+#FIXME
+cp $TKD_EXTENSIONS_PATH/railties-4.2.1_app_base.rb Gems/$TKD_RUBY_NAMESPACE/gems/railties-4.2.1/lib/rails/generators/app_base.rb
cp -R $TKD_SUPPLEMENTS_PATH/iconv Gems/supps/iconv
cp -R $TKD_SUPPLEMENTS_PATH/bin_files Gems/bin_files
View
45 Scripts/package.sh
@@ -6,12 +6,18 @@ export RUBY_BINARY_PATH="$root/dist"
export COMPRESSED_SOURCE_PATH="$root/../compressed"
export BUILD_TOOLS_PATH="/Users/andraswhite/Code/static/builds"
+export TKD_ARCH="x86_64"
+export TKD_DARWIN="darwin12.0"
+export TKD_ARCH_DARWIN="$TKD_ARCH-$TKD_DARWIN"
+
export TKD_RUBY_VERSION="2.2.2"
export TKD_RUBY_PATCH_VERSION="p95"
export TKD_RUBY="$TKD_RUBY_VERSION-$TKD_RUBY_PATCH_VERSION"
export TKD_RUBY_NAMESPACE_TINY="2.2"
export TKD_RUBY_NAMESPACE="2.2.0"
+export TKD_RAILS_VERSION="4.2.1"
+
export TKD_TMP_PATH="$root/tmp"
export TKD_SUPPLEMENTS_PATH="$root/supplements"
export TKD_EXTENSIONS_PATH=$TKD_SUPPLEMENTS_PATH
@@ -20,14 +26,17 @@ if [ -d "b" ]
then
b/build_binary.sh
else
- echo "No Ruby build script found. Compile a Ruby (Ex: $TKD_RUBY) and place it in $RUBY_BINARY_PATH"
- echo "Falling back to Tokaido bundled Ruby $TKD_RUBY..."
- mkdir -p $RUBY_BINARY_PATH
- cp $root/Tokaido/Rubies/$TKD_RUBY.zip $RUBY_BINARY_PATH/$TKD_RUBY.zip
- cd $RUBY_BINARY_PATH
- unzip $TKD_RUBY.zip
- rm $TKD_RUBY.zip
- cd $root
+ if [ ! -d $RUBY_BINARY_PATH/$TKD_RUBY ]
+ then
+ echo "No Ruby build script found. Compile a Ruby (Ex: $TKD_RUBY) and place it in $RUBY_BINARY_PATH"
+ echo "Falling back to Tokaido bundled Ruby $TKD_RUBY..."
+ mkdir -p $RUBY_BINARY_PATH
+ cp $root/Tokaido/Rubies/$TKD_RUBY.zip $RUBY_BINARY_PATH/$TKD_RUBY.zip
+ cd $RUBY_BINARY_PATH
+ unzip $TKD_RUBY.zip
+ rm $TKD_RUBY.zip
+ cd $root
+ fi
fi
export PATH="$RUBY_BINARY_PATH/$TKD_RUBY/bin:$PATH";
@@ -58,16 +67,16 @@ Scripts/gems.sh
Scripts/tokaido_modules.sh
Scripts/binaries.sh
-cp -R $RUBY_BINARY_PATH/$TKD_RUBY $TKD_TMP_PATH/$TKD_RUBY
-
-if [ -d "$TKD_SUPPLEMENTS_PATH/$TKD_RUBY_VERSION" ] && [ -d "$TKD_TMP_PATH/$TKD_RUBY/lib/ruby/$TKD_RUBY_NAMESPACE/x86_64-darwin12.0" ]
+if [ -d "b" ]
then
- cp $TKD_SUPPLEMENTS_PATH/$TKD_RUBY_VERSION/rb_config_release.rb $TKD_TMP_PATH/$TKD_RUBY/lib/ruby/$TKD_RUBY_NAMESPACE/x86_64-darwin12.0/rbconfig.rb
+ cp $TKD_SUPPLEMENTS_PATH/$TKD_RUBY_VERSION/rb_config_release.rb $RUBY_BINARY_PATH/$TKD_RUBY/lib/ruby/$TKD_RUBY_NAMESPACE/$TKD_ARCH_DARWIN/rbconfig.rb
+ cp $TKD_SUPPLEMENTS_PATH/$TKD_RUBY_VERSION/ruby-$TKD_RUBY_NAMESPACE_TINY.pc $RUBY_BINARY_PATH/$TKD_RUBY/lib/pkgconfig/ruby-$TKD_RUBY_NAMESPACE_TINY.pc
+ cd $RUBY_BINARY_PATH
+ zip -r $TKD_RUBY.zip $TKD_RUBY
+ cp $RUBY_BINARY_PATH/$TKD_RUBY.zip $root/Tokaido/Rubies/$TKD_RUBY.zip
+ cd $root
+ rm -Rf src
fi
-cp $TKD_SUPPLEMENTS_PATH/$TKD_RUBY_VERSION/ruby-$TKD_RUBY_NAMESPACE_TINY.pc $TKD_TMP_PATH/$TKD_RUBY/lib/pkgconfig/ruby-$TKD_RUBY_NAMESPACE_TINY.pc
-
-cd $TKD_TMP_PATH
-zip -r $TKD_RUBY.zip $TKD_RUBY
-cd $root
-Scripts/copy.sh
+rm -Rf $RUBY_BINARY_PATH
+Scripts/copy_tokaido_dependencies.sh
View
354 Supplements/railties-4.2.1_app_base.rb
@@ -0,0 +1,354 @@
+require 'digest/md5'
+require 'active_support/core_ext/string/strip'
+require 'rails/version' unless defined?(Rails::VERSION)
+require 'open-uri'
+require 'uri'
+require 'rails/generators'
+require 'active_support/core_ext/array/extract_options'
+
+module Rails
+ module Generators
+ class AppBase < Base # :nodoc:
+ DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver )
+ JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc )
+ DATABASES.concat(JDBC_DATABASES)
+
+ attr_accessor :rails_template
+ add_shebang_option!
+
+ argument :app_path, type: :string
+
+ def self.strict_args_position
+ false
+ end
+
+ def self.add_shared_options_for(name)
+ class_option :template, type: :string, aliases: '-m',
+ desc: "Path to some #{name} template (can be a filesystem path or URL)"
+
+ class_option :skip_gemfile, type: :boolean, default: false,
+ desc: "Don't create a Gemfile"
+
+ class_option :skip_bundle, type: :boolean, aliases: '-B', default: true,
+ desc: "Don't run bundle install"
+
+ class_option :skip_git, type: :boolean, aliases: '-G', default: false,
+ desc: 'Skip .gitignore file'
+
+ class_option :skip_keeps, type: :boolean, default: false,
+ desc: 'Skip source control .keep files'
+
+ class_option :skip_active_record, type: :boolean, aliases: '-O', default: false,
+ desc: 'Skip Active Record files'
+
+ class_option :skip_sprockets, type: :boolean, aliases: '-S', default: false,
+ desc: 'Skip Sprockets files'
+
+ class_option :skip_spring, type: :boolean, default: false,
+ desc: "Don't install Spring application preloader"
+
+ class_option :database, type: :string, aliases: '-d', default: 'sqlite3',
+ desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})"
+
+ class_option :javascript, type: :string, aliases: '-j', default: 'jquery',
+ desc: 'Preconfigure for selected JavaScript library'
+
+ class_option :skip_javascript, type: :boolean, aliases: '-J', default: false,
+ desc: 'Skip JavaScript files'
+
+ class_option :dev, type: :boolean, default: false,
+ desc: "Setup the #{name} with Gemfile pointing to your Rails checkout"
+
+ class_option :edge, type: :boolean, default: false,
+ desc: "Setup the #{name} with Gemfile pointing to Rails repository"
+
+ class_option :skip_turbolinks, type: :boolean, default: false,
+ desc: 'Skip turbolinks gem'
+
+ class_option :skip_test_unit, type: :boolean, aliases: '-T', default: false,
+ desc: 'Skip Test::Unit files'
+
+ class_option :rc, type: :string, default: false,
+ desc: "Path to file containing extra configuration options for rails command"
+
+ class_option :no_rc, type: :boolean, default: false,
+ desc: 'Skip loading of extra configuration options from .railsrc file'
+
+ class_option :help, type: :boolean, aliases: '-h', group: :rails,
+ desc: 'Show this help message and quit'
+ end
+
+ def initialize(*args)
+ @gem_filter = lambda { |gem| true }
+ @extra_entries = []
+ super
+ convert_database_option_for_jruby
+ end
+
+ protected
+
+ def gemfile_entry(name, *args)
+ options = args.extract_options!
+ version = args.first
+ github = options[:github]
+ path = options[:path]
+
+ if github
+ @extra_entries << GemfileEntry.github(name, github)
+ elsif path
+ @extra_entries << GemfileEntry.path(name, path)
+ else
+ @extra_entries << GemfileEntry.version(name, version)
+ end
+ self
+ end
+
+ def gemfile_entries
+ [rails_gemfile_entry,
+ database_gemfile_entry,
+ assets_gemfile_entry,
+ javascript_gemfile_entry,
+ jbuilder_gemfile_entry,
+ sdoc_gemfile_entry,
+ psych_gemfile_entry,
+ @extra_entries].flatten.find_all(&@gem_filter)
+ end
+
+ def add_gem_entry_filter
+ @gem_filter = lambda { |next_filter, entry|
+ yield(entry) && next_filter.call(entry)
+ }.curry[@gem_filter]
+ end
+
+ def builder
+ @builder ||= begin
+ builder_class = get_builder_class
+ builder_class.send(:include, ActionMethods)
+ builder_class.new(self)
+ end
+ end
+
+ def build(meth, *args)
+ builder.send(meth, *args) if builder.respond_to?(meth)
+ end
+
+ def create_root
+ valid_const?
+
+ empty_directory '.'
+ FileUtils.cd(destination_root) unless options[:pretend]
+ end
+
+ def apply_rails_template
+ apply rails_template if rails_template
+ rescue Thor::Error, LoadError, Errno::ENOENT => e
+ raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
+ end
+
+ def set_default_accessors!
+ self.destination_root = File.expand_path(app_path, destination_root)
+ self.rails_template = case options[:template]
+ when /^https?:\/\//
+ options[:template]
+ when String
+ File.expand_path(options[:template], Dir.pwd)
+ else
+ options[:template]
+ end
+ end
+
+ def database_gemfile_entry
+ return [] if options[:skip_active_record]
+ GemfileEntry.version gem_for_database, nil,
+ "Use #{options[:database]} as the database for Active Record"
+ end
+
+ def include_all_railties?
+ !options[:skip_active_record] && !options[:skip_test_unit] && !options[:skip_sprockets]
+ end
+
+ def comment_if(value)
+ options[value] ? '# ' : ''
+ end
+
+ def sqlite3?
+ !options[:skip_active_record] && options[:database] == 'sqlite3'
+ end
+
+ class GemfileEntry < Struct.new(:name, :version, :comment, :options, :commented_out)
+ def initialize(name, version, comment, options = {}, commented_out = false)
+ super
+ end
+
+ def self.github(name, github, branch = nil, comment = nil)
+ if branch
+ new(name, nil, comment, github: github, branch: branch)
+ else
+ new(name, nil, comment, github: github)
+ end
+ end
+
+ def self.version(name, version, comment = nil)
+ new(name, version, comment)
+ end
+
+ def self.path(name, path, comment = nil)
+ new(name, nil, comment, path: path)
+ end
+ end
+
+ def rails_gemfile_entry
+ if options.dev?
+ [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH)]
+ elsif options.edge?
+ [GemfileEntry.github('rails', 'rails/rails', '4-2-stable')]
+ else
+ [GemfileEntry.version('rails',
+ Rails::VERSION::STRING,
+ "Bundle edge Rails instead: gem 'rails', github: 'rails/rails'")]
+ end
+ end
+
+ def gem_for_database
+ # %w( mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql )
+ case options[:database]
+ when "oracle" then "ruby-oci8"
+ when "postgresql" then "pg"
+ when "frontbase" then "ruby-frontbase"
+ when "mysql" then "mysql2"
+ when "sqlserver" then "activerecord-sqlserver-adapter"
+ when "jdbcmysql" then "activerecord-jdbcmysql-adapter"
+ when "jdbcsqlite3" then "activerecord-jdbcsqlite3-adapter"
+ when "jdbcpostgresql" then "activerecord-jdbcpostgresql-adapter"
+ when "jdbc" then "activerecord-jdbc-adapter"
+ else options[:database]
+ end
+ end
+
+ def convert_database_option_for_jruby
+ if defined?(JRUBY_VERSION)
+ case options[:database]
+ when "oracle" then options[:database].replace "jdbc"
+ when "postgresql" then options[:database].replace "jdbcpostgresql"
+ when "mysql" then options[:database].replace "jdbcmysql"
+ when "sqlite3" then options[:database].replace "jdbcsqlite3"
+ end
+ end
+ end
+
+ def assets_gemfile_entry
+ return [] if options[:skip_sprockets]
+
+ gems = []
+ gems << GemfileEntry.version('sass-rails', '~> 5.0',
+ 'Use SCSS for stylesheets')
+
+ gems << GemfileEntry.version('uglifier',
+ '>= 1.3.0',
+ 'Use Uglifier as compressor for JavaScript assets')
+
+ gems
+ end
+
+ def jbuilder_gemfile_entry
+ comment = 'Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder'
+ GemfileEntry.version('jbuilder', '~> 2.0', comment)
+ end
+
+ def sdoc_gemfile_entry
+ comment = 'bundle exec rake doc:rails generates the API under doc/api.'
+ GemfileEntry.new('sdoc', '~> 0.4.0', comment, group: :doc)
+ end
+
+ def coffee_gemfile_entry
+ comment = 'Use CoffeeScript for .coffee assets and views'
+ GemfileEntry.version 'coffee-rails', '~> 4.1.0', comment
+ end
+
+ def javascript_gemfile_entry
+ if options[:skip_javascript]
+ []
+ else
+ gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry]
+ gems << GemfileEntry.version("#{options[:javascript]}-rails", nil,
+ "Use #{options[:javascript]} as the JavaScript library")
+
+ unless options[:skip_turbolinks]
+ gems << GemfileEntry.version("turbolinks", nil,
+ "Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks")
+ end
+
+ gems
+ end
+ end
+
+ def javascript_runtime_gemfile_entry
+ comment = 'See https://github.com/rails/execjs#readme for more supported runtimes'
+ if defined?(JRUBY_VERSION)
+ GemfileEntry.version 'therubyrhino', nil, comment
+ else
+ GemfileEntry.new 'therubyracer', nil, comment, { platforms: :ruby }, true
+ end
+ end
+
+ def psych_gemfile_entry
+ return [] unless defined?(Rubinius)
+
+ comment = 'Use Psych as the YAML engine, instead of Syck, so serialized ' \
+ 'data can be read safely from different rubies (see http://git.io/uuLVag)'
+ GemfileEntry.new('psych', '~> 2.0', comment, platforms: :rbx)
+ end
+
+ def bundle_command(command)
+ say_status :run, "bundle #{command}"
+
+ # We are going to shell out rather than invoking Bundler::CLI.new(command)
+ # because `rails new` loads the Thor gem and on the other hand bundler uses
+ # its own vendored Thor, which could be a different version. Running both
+ # things in the same process is a recipe for a night with paracetamol.
+ #
+ # We use backticks and #print here instead of vanilla #system because it
+ # is easier to silence stdout in the existing test suite this way. The
+ # end-user gets the bundler commands called anyway, so no big deal.
+ #
+ # We unset temporary bundler variables to load proper bundler and Gemfile.
+ #
+ # Thanks to James Tucker for the Gem tricks involved in this call.
+ _bundle_command = Gem.bin_path('bundler', 'bundle')
+
+ require 'bundler'
+ Bundler.with_clean_env do
+ output = `"#{Gem.ruby}" "#{_bundle_command}" #{command}`
+ print output unless options[:quiet]
+ end
+ end
+
+ def bundle_install?
+ !(options[:skip_gemfile] || options[:skip_bundle] || options[:pretend])
+ end
+
+ def spring_install?
+ !options[:skip_spring] && Process.respond_to?(:fork) && !RUBY_PLATFORM.include?("cygwin")
+ end
+
+ def run_bundle
+ bundle_command('install') if bundle_install?
+ end
+
+ def generate_spring_binstubs
+ if bundle_install? && spring_install?
+ bundle_command("exec spring binstub --all")
+ end
+ end
+
+ def empty_directory_with_keep_file(destination, config = {})
+ empty_directory(destination, config)
+ keep_file(destination)
+ end
+
+ def keep_file(destination)
+ create_file("#{destination}/.keep") unless options[:skip_keeps]
+ end
+ end
+ end
+end

0 comments on commit ec3366f

Please sign in to comment.