td 0.10.49 → 0.10.50

data/ChangeLog

@@ -1,4 +1,11 @@
 
+== 2012-09-20 version 0.10.50
+
+* Changed packaging method from Jeweler to Bundler
+* Updated packaging scripts for Windows
+* Updated packaging scripts for Mac OS X
+
+
 == 2012-09-19 version 0.10.49
 
 * query and job:show subcommands support -G, --vertical option

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/README.rdoc

@@ -29,6 +29,22 @@ You need to authorize the account, before executing any other commands.
     > td database:create mydb             # create a database
     > td table:create mydb www_access     # create a table
 
+= Packaging
+
+== Mac OS X
+
+    $ gem install bundler
+    $ rake pkg:build
+
+== Windows
+
+First of all, install cygwin.
+Then install gcc and ruby packages using cygwin installer.
+
+    $ gem install bundler
+    $ rake exe:build
+
+
 = Copyright
 
 Copyright:: Copyright (c) 2011 Treasure Data Inc.

data/Rakefile

@@ -0,0 +1,101 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+task :default => :build
+
+# common methods for package build scripts
+require 'fileutils'
+require "erb"
+
+def version
+  require project_root_path('lib/td/version')
+  TreasureData::VERSION
+end
+
+def project_root_path(path)
+  "#{PROJECT_ROOT}/#{path}"
+end
+
+PROJECT_ROOT = File.expand_path(File.dirname(__FILE__))
+USE_GEMS = ["#{PROJECT_ROOT}/pkg/td-#{version}.gem"]
+
+def install_use_gems(target_dir)
+  unless ENV['GEM_HOME'].to_s.empty?
+    puts "**"
+    puts "** WARNING"
+    puts "**"
+    puts "** GEM_HOME is already set. Created package may be broken."
+    puts "** RVM surely breaks the package. Use rbenv instead."
+    puts "**"
+  end
+  env = {
+    'GEM_HOME' => target_dir,
+    'GEM_PATH' => '',
+  }
+  USE_GEMS.each {|gem|
+    system env, "gem install '#{gem}' --no-rdoc --no-ri"
+  }
+end
+
+def resource_path(path)
+  project_root_path("dist/resources/#{path}")
+end
+
+def install_resource(resource_name, target_path, mode)
+  FileUtils.mkdir_p File.dirname(target_path)
+  FileUtils.cp resource_path(resource_name), target_path
+  File.chmod(mode, target_path)
+end
+
+def install_erb_resource(resource_name, target_path, mode, variables)
+  FileUtils.mkdir_p File.dirname(target_path)
+  erb_raw = File.read resource_path(resource_name)
+
+  ctx = Object.new
+  variables.each_pair {|k,v| ctx.define_singleton_method(k) { v } }
+  data = ERB.new(erb_raw).result(ctx.instance_eval("binding"))
+
+  File.open(target_path, "w") do |f|
+    f.write data
+  end
+  File.chmod(mode, target_path)
+end
+
+def mkchdir(dir, &block)
+  FileUtils.mkdir_p dir
+  Dir.chdir(dir) do |dir|
+    yield File.expand_path(dir)
+  end
+end
+
+def build_dir_path(type)
+  project_root_path("build/#{type}.build")
+end
+
+def create_build_dir(type, &block)
+  dir = build_dir_path(type)
+  FileUtils.rm_rf dir
+  FileUtils.mkdir_p dir
+  begin
+    mkchdir(dir, &block)
+    success = true
+  ensure
+    #FileUtils.rm_rf(dir) if success
+  end
+end
+
+def download_resource(url)
+  fname = File.basename(url).gsub(/\?.*$/,'')
+  path = project_root_path("build/cache/#{fname}")
+  if File.exists?(path) && Time.now - File.mtime(path) < 24*60*60
+    return path
+  end
+  FileUtils.mkdir_p File.dirname(path)
+  sh "curl '#{url}' -o '#{path}'"
+  path
+end
+
+Dir[File.expand_path("../dist/**/*.rake", __FILE__)].each do |rake|
+  import rake
+end
+

data/dist/exe.rake

@@ -0,0 +1,43 @@
+
+desc "build Windows exe package"
+task 'exe:build' => :build do
+  create_build_dir('exe') do |dir|
+    # create ./installers/
+    FileUtils.mkdir_p "installers"
+    installer_path = download_resource('http://heroku-toolbelt.s3.amazonaws.com/rubyinstaller.exe')
+    FileUtils.cp installer_path, "installers/rubyinstaller.exe"
+
+    variables = {
+      :version => version,
+      :basename => "td-#{version}",
+      :outdir => ".",
+    }
+
+    # create ./td/
+    mkchdir("td") do
+      mkchdir('gems') do
+        install_use_gems(Dir.pwd)
+      end
+      install_resource 'exe/td', 'bin/td', 0755
+      install_resource 'exe/td.bat', 'bin/td.bat', 0755
+      install_resource 'exe/td-cmd.bat', 'td-cmd.bat', 0755
+    end
+
+    # create td.iss and run Inno Setup
+    install_erb_resource 'exe/td.iss', 'td.iss', 0644, variables
+
+    inno_dir = ENV["INNO_DIR"] || 'C:/Program Files (x86)/Inno Setup 5'
+    inno_bin = ENV["INNO_BIN"] || "#{inno_dir}/Compil32.exe"
+    puts "INNO_BIN: #{inno_bin}"
+
+    sh "\"#{inno_bin}\" /cc \"td.iss\""
+    FileUtils.cp "td-#{version}.exe", project_root_path("pkg/td-#{version}.exe")
+  end
+end
+
+desc "clean Windows exe package"
+task "exe:clean" do
+  FileUtils.rm_rf build_dir_path('exe')
+  FileUtils.rm_rf project_root_path("exe/td-#{version}.exe")
+end
+

data/dist/pkg.rake

@@ -0,0 +1,48 @@
+
+desc "build Mac OS X pkg package"
+task 'pkg:build' => :build do
+  create_build_dir('pkg') do |dir|
+    FileUtils.mkdir_p "bundle"
+    FileUtils.mkdir_p "bundle/Resources"
+    FileUtils.mkdir_p "bundle/td-client.pkg"
+    FileUtils.mkdir_p "bundle/td-client.pkg"
+
+    # create ./bundle/td-client.pkg/Payload
+    mkchdir('td-client.build') do
+      mkchdir('gems') do
+        install_use_gems(Dir.pwd)
+      end
+      install_resource 'pkg/td', 'bin/td', 0755
+      sh "pax -wz -x cpio . > ../bundle/td-client.pkg/Payload"
+    end
+
+    # crete ./bundle/td-client.pkg/Bom
+    sh "mkbom -s td-client.build bundle/td-client.pkg/Bom"
+
+    # crete ./bundle/td-client.pkg/Scripts/
+    install_resource 'pkg/postinstall', 'bundle/td-client.pkg/Scripts/postinstall', 0755
+
+    variables = {
+      :version => version,
+      :kbytes => `du -ks td-client.build | cut -f 1`.strip.to_i,
+      :num_files => `find td-client.build | wc -l`,
+    }
+
+    # create ./bundle/td-client.pkg/PackageInfo
+    install_erb_resource('pkg/PackageInfo.erb', 'bundle/td-client.pkg/PackageInfo', 0644, variables)
+
+    # create ./bundle/Distribution
+    install_erb_resource('pkg/Distribution.erb', 'bundle/Distribution', 0644, variables)
+
+    # create td-a.b.c.pkg
+    sh "pkgutil --flatten bundle td-#{version}.pkg"
+    FileUtils.cp "td-#{version}.pkg", project_root_path("pkg/td-#{version}.pkg")
+  end
+end
+
+desc "clean Mac OS X pkg package"
+task "pkg:clean" do
+  FileUtils.rm_rf build_dir_path('pkg')
+  FileUtils.rm_rf project_root_path("pkg/td-#{version}.pkg")
+end
+

data/dist/resources/exe/td

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+# avoid conflicts with rvm
+ENV.delete 'GEM_HOME'
+ENV.delete 'GEM_PATH'
+
+# attempt to load rubygems
+begin
+  require "rubygems"
+rescue LoadError
+end
+
+# resolve bin path, ignoring symlinks
+require "pathname"
+here = File.dirname(Pathname.new(__FILE__).realpath)
+
+# add locally installed gems to libpath
+gem_dir = File.expand_path("../gems", here)
+Dir["#{gem_dir}/**/lib"].each do |libdir|
+  $:.unshift libdir
+end
+
+# start up the CLI
+require 'td/command/runner'
+TreasureData::Command::Runner.new.run ARGV

data/dist/resources/exe/td-cmd.bat

@@ -0,0 +1 @@
+@cmd /k td

data/dist/resources/exe/td.bat

@@ -0,0 +1,29 @@
+@ECHO OFF
+
+:: determine if this is x86 or x64
+if "%processor_architecture%" == "IA64"  goto x64
+if "%processor_architecture%" == "AMD64" goto x64
+if "%ProgramFiles%" == "%ProgramW6432%"  goto x64
+goto x86
+
+:x86
+set TDRubyPath=%ProgramFiles%\ruby-1.9.3
+goto launch
+
+:x64
+set TDRubyPath=%ProgramFiles(x86)%\ruby-1.9.3
+goto launch
+
+:launch
+
+:: determine if this is an NT operating system
+if not "%~f0" == "~f0" goto WinNT
+goto Win9x
+
+:Win9x
+@"%TDRubyPath%\bin\ruby.exe" "td" %1 %2 %3 %4 %5 %6 %7 %8 %9
+goto :EOF
+
+:WinNT
+@"%TDRubyPath%\bin\ruby.exe" "%~dpn0" %*
+goto :EOF

data/dist/resources/exe/td.iss

@@ -0,0 +1,73 @@
+[Setup]
+AppName=Treasure Data
+AppVersion=<%= version %>
+DefaultDirName={pf}\Treasure Data
+DefaultGroupName=Treasure Data
+Compression=lzma2
+SolidCompression=yes
+OutputBaseFilename=<%= basename %>
+OutputDir=<%= outdir %>
+ChangesEnvironment=yes
+UsePreviousSetupType=no
+AlwaysShowComponentsList=no
+
+; For Ruby expansion ~ 32MB (installed) - 12MB (installer)
+ExtraDiskSpaceRequired=20971520
+
+[Types]
+Name: client; Description: "Full Installation";
+Name: custom; Description: "Custom Installation"; flags: iscustom
+
+[Components]
+Name: "toolbelt"; Description: "Treasure Data Toolbelt"; Types: "client custom"
+Name: "toolbelt/client"; Description: "Treasure Data Client"; Types: "client custom"; Flags: fixed
+<%#Name: "toolbelt/foreman"; Description: "Foreman"; Types: "client custom"%>
+
+[Files]
+Source: "td\*.*"; DestDir: "{app}"; Flags: recursesubdirs; Components: "toolbelt/client"
+Source: "installers\rubyinstaller.exe"; DestDir: "{tmp}"; Components: "toolbelt/client"
+
+[Icons]
+Name: "{group}\Treasure Data command prompt"; Filename: "{app}\td-cmd.bat"
+
+[Registry]
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: "expandsz"; ValueName: "TreasureDataPath"; \
+  ValueData: "{app}"
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: "expandsz"; ValueName: "Path"; \
+  ValueData: "{olddata};{app}\bin"; Check: NeedsAddPath(ExpandConstant('{app}\bin'))
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: "expandsz"; ValueName: "Path"; \
+  ValueData: "{olddata};{pf}\ruby-1.9.3\bin"; Check: NeedsAddPath(ExpandConstant('{pf}\ruby-1.9.3\bin'))
+Root: HKCU; Subkey: "Environment"; ValueType: "expandsz"; ValueName: "HOME"; \
+  ValueData: "%USERPROFILE%"; Flags: createvalueifdoesntexist
+
+[Run]
+Filename: "{tmp}\rubyinstaller.exe"; Parameters: "/verysilent /noreboot /nocancel /noicons /dir=""{pf}/ruby-1.9.3"""; \
+  Flags: shellexec waituntilterminated; StatusMsg: "Installing Ruby"; Components: "toolbelt/client"
+<%#Filename: "{pf}\ruby-1.9.3\bin\gem.bat"; Parameters: "install foreman --no-rdoc --no-ri"; %>
+<%#  Flags: runhidden shellexec waituntilterminated; StatusMsg: "Installing Foreman"; Components: "toolbelt/foreman"%>
+Filename: "{app}\td-cmd.bat"; Description: "Run command prompt"; Flags: postinstall
+
+[Code]
+
+function NeedsAddPath(Param: string): boolean;
+var
+  OrigPath: string;
+begin
+  if not RegQueryStringValue(HKEY_LOCAL_MACHINE,
+    'SYSTEM\CurrentControlSet\Control\Session Manager\Environment',
+    'Path', OrigPath)
+  then begin
+    Result := True;
+    exit;
+  end;
+  // look for the path with leading and trailing semicolon
+  // Pos() returns 0 if not found
+  Result := Pos(';' + Param + ';', ';' + OrigPath + ';') = 0;
+end;
+
+function IsProgramInstalled(Name: string): boolean;
+var
+  ResultCode: integer;
+begin
+  Result := Exec(Name, 'version', '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
+end;

data/dist/resources/pkg/Distribution.erb

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<installer-script minSpecVersion="1.000000" authoringTool="org.ruby-lang.rake" authoringToolVersion="0.8.7">
+  <title>TreasureData Client</title>
+  <options customize="allow" allow-external-scripts="no"/>
+  <domains enable_localSystem="true"/>
+  <choices-outline>
+    <line choice="td-client"/>
+  </choices-outline>
+  <choice id="td-client" title="TreasureData Client">
+    <pkg-ref id="com.td.client"/>
+  </choice>
+  <pkg-ref id="com.td.client" installKBytes="<%= kbytes %>" version="<%= version %>" auth="Root">#td-client.pkg</pkg-ref>
+</installer-script>

data/dist/resources/pkg/PackageInfo.erb

@@ -0,0 +1,6 @@
+<pkg-info format-version="2" identifier="com.td.toolbelt" version="<%= version %>" install-location="/usr/local/td" auth="root">
+  <payload installKBytes="<%= kbytes %>" numberOfFiles="<%= num_files %>"/>
+  <scripts>
+    <postinstall file="./postinstall"/>
+  </scripts>
+</pkg-info>

data/dist/resources/pkg/postinstall

@@ -0,0 +1,7 @@
+#!/bin/sh
+ln -sf /usr/local/td/bin/td /usr/bin/td
+osascript -e '
+tell application "Terminal"
+    activate
+    do script "td"
+end tell'

data/dist/resources/pkg/td

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby
+# -*- coding: utf-8 -*-
+
+# avoid conflicts with rvm
+ENV.delete 'GEM_HOME'
+ENV.delete 'GEM_PATH'
+
+# attempt to load rubygems
+begin
+  require "rubygems"
+rescue LoadError
+end
+
+# resolve bin path, ignoring symlinks
+require "pathname"
+here = File.dirname(Pathname.new(__FILE__).realpath)
+
+# add locally installed gems to libpath
+gem_dir = File.expand_path("../gems", here)
+Dir["#{gem_dir}/**/lib"].each do |libdir|
+  $:.unshift libdir
+end
+
+# start up the CLI
+require "td/command/runner"
+TreasureData::Command::Runner.new.run ARGV

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.49'
+VERSION = '0.10.50'
 
 end

data/td.gemspec

@@ -0,0 +1,25 @@
+# encoding: utf-8
+$:.push File.expand_path('../lib', __FILE__)
+require 'td/version'
+
+Gem::Specification.new do |gem|
+  gem.name        = "td"
+  gem.description = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing"
+  gem.homepage    = "http://treasure-data.com/"
+  gem.summary     = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing"
+  gem.version     = TreasureData::VERSION
+  gem.authors     = ["Treasure Data, Inc."]
+  gem.email       = "support@treasure-data.com"
+  gem.has_rdoc    = false
+  gem.files       = `git ls-files`.split("\n")
+  gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.require_paths = ['lib']
+
+  gem.add_dependency "msgpack", "~> 0.4.4"
+  gem.add_dependency "json", ">= 1.4.3"
+  gem.add_dependency "hirb", ">= 0.4.5"
+  gem.add_dependency "td-client", "~> 0.8.29"
+  gem.add_dependency "td-logger", "~> 0.3.12"
+  gem.add_development_dependency "rake", "~> 0.9"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.49
+  version: 0.10.50
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -107,33 +107,30 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
 description: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing
 email: support@treasure-data.com
 executables:
 - td
 extensions: []
-extra_rdoc_files:
+extra_rdoc_files: []
+files:
 - ChangeLog
+- Gemfile
 - README.rdoc
-files:
+- Rakefile
+- bin/td
 - data/sample_apache.json
 - data/sample_apache_gen.rb
+- dist/exe.rake
+- dist/pkg.rake
+- dist/resources/exe/td
+- dist/resources/exe/td-cmd.bat
+- dist/resources/exe/td.bat
+- dist/resources/exe/td.iss
+- dist/resources/pkg/Distribution.erb
+- dist/resources/pkg/PackageInfo.erb
+- dist/resources/pkg/postinstall
+- dist/resources/pkg/td
 - lib/td.rb
 - lib/td/command/account.rb
 - lib/td/command/acl.rb
@@ -166,9 +163,7 @@ files:
 - lib/td/distribution.rb
 - lib/td/file_reader.rb
 - lib/td/version.rb
-- ChangeLog
-- README.rdoc
-- bin/td
+- td.gemspec
 homepage: http://treasure-data.com/
 licenses: []
 post_install_message: 
@@ -194,3 +189,4 @@ signing_key:
 specification_version: 3
 summary: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing
 test_files: []
+has_rdoc: false