td 0.11.8 → 0.11.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7517598e29ec516a589d42d0b1955ddbe2279493
-  data.tar.gz: aa7597906e87e24fe94c9529bd33eede0922a218
+  metadata.gz: 3acbc09262773106c3a2635cf158f204d130b645
+  data.tar.gz: 7827d370f2da079c98f41e88956c9714303dece5
 SHA512:
-  metadata.gz: b59f3192dece017a26edd4012f55c02ab54cc135c7e63d054fa8e7eeec259f43faf59f0b20a1207f7b30e48064dc00735a1d2df8bd84e8540fb0d4a3a965e495
-  data.tar.gz: af178fd2dc244ba7726e7ad5c62a8be7dc6bec3b5f8a6bf357cfb2ddf432b3cf302f7ba2b91d6e83e4173effce885c4a2be0d409a0b712d61fafe2d651a6c755
+  metadata.gz: 26334fe3feb928becaeff73400504d27e8c92b7655b3a04c0eed21a054620ca8cf0a3cacf422242dab8f1c85395d9a9e503f1bfb764aed28e2699ce192609b95
+  data.tar.gz: 8801b5016d6eb543c5c5382b9bb6ea5076674619a72f85f7a1c1871412f73483b75d0b3b1e79e1c7af817505acbf1fe561e2cc519d068d0474c85d1bb04400f8

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2015-03-19 version 0.11.8.1
+
+* Fix: exclude dist directory from gem package.
+  This release is gem, not Toolbelt. It only includes td.gemspec change from
+  0.11.8.
+
 == 2015-02-20 version 0.11.8
 
 * Fix: save CSV/TSV file without transcoding.

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.11.8'
+  TOOLBELT_VERSION = '0.11.8.1'
 end

data/td.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.authors               = ["Treasure Data, Inc."]
   gem.email                 = "support@treasure-data.com"
   gem.has_rdoc              = false
-  gem.files                 = `git ls-files`.split("\n")
+  gem.files                 = `git ls-files`.split("\n").select { |f| !f.start_with?('dist') }
   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']

metadata

@@ -1,183 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.11.8.1
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - '!='
+    - - "!="
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: td-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.68
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.68
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.21
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.4
 description: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing
@@ -187,7 +187,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - ChangeLog
 - Gemfile
 - README.rdoc
@@ -197,17 +197,6 @@ files:
 - contrib/completion/td-completion.bash
 - 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/ruby-2.0.0-p0.pkg
-- dist/resources/pkg/td
 - java/logging.properties
 - lib/td.rb
 - lib/td/command/account.rb
@@ -269,17 +258,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing

data/dist/exe.rake

@@ -1,46 +0,0 @@
-
-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://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-1.9.3-p545.exe?direct')
-    FileUtils.cp installer_path, "installers/rubyinstaller.exe"
-
-    variables = {
-      :version => version,
-      :basename => "td-#{version}",
-      :outdir => ".",
-    }
-
-    # create ./td/
-    mkchdir("td") do
-      mkchdir('vendor/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
-
-    zip_files(project_root_path("pkg/td-update-exe-#{version}.zip"), 'td')
-
-    # 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("pkg/td-#{version}.exe")
-  FileUtils.rm_rf project_root_path("pkg/td-update-exe-#{version}.zip")
-end
-

data/dist/pkg.rake

@@ -1,54 +0,0 @@
-
-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('vendor/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
-
-    zip_files(project_root_path("pkg/td-update-pkg-#{version}.zip"), 'td-client.build')
-
-    # create ./bundle/td-client.pkg/Bom
-    sh "mkbom -s td-client.build bundle/td-client.pkg/Bom"
-
-    # create ./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)
-
-    sh "pkgutil --expand #{project_root_path('dist/resources/pkg/ruby-2.0.0-p0.pkg')} ruby"
-    mv "ruby/ruby-2.0.0-p0.pkg", "bundle/ruby.pkg"
-
-    # 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")
-  FileUtils.rm_rf project_root_path("pkg/td-update-pkg-#{version}.zip")
-end
-

data/dist/resources/exe/td

@@ -1,30 +0,0 @@
-#!/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("../vendor/gems", here)
-Dir["#{gem_dir}/**/lib"].each do |libdir|
-  $:.unshift libdir
-end
-
-# inject any code in ~/.td/updated/vendor/gems over top
-require 'td/updater'
-TreasureData::Updater.inject_libpath
-
-# start up the CLI
-require 'td/command/runner'
-exit TreasureData::Command::Runner.new.run ARGV

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

@@ -1,2 +0,0 @@
-@cd %USERPROFILE%
-@cmd /k td

data/dist/resources/exe/td.bat

@@ -1,13 +0,0 @@
-@ECHO OFF
-
-:: determine if this is an NT operating system
-if not "%~f0" == "~f0" goto WinNT
-goto Win9x
-
-:Win9x
-@"%~dp0\..\ruby-1.9.3\bin\ruby.exe" "td" %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto :EOF
-
-:WinNT
-@"%~dp0\..\ruby-1.9.3\bin\ruby.exe" "%~dpn0" %*
-goto :EOF

data/dist/resources/exe/td.iss

@@ -1,66 +0,0 @@
-[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
-
-[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: "Path"; \
-  ValueData: "{olddata};{app}\bin"; Check: NeedsAddPath(ExpandConstant('{app}\bin'))
-Root: HKCU; Subkey: "Environment"; ValueType: "expandsz"; ValueName: "HOME"; \
-  ValueData: "%USERPROFILE%"; Flags: createvalueifdoesntexist
-
-[Run]
-Filename: "{tmp}\rubyinstaller.exe"; Parameters: "/verysilent /noreboot /nocancel /noicons /dir=""{app}/ruby-1.9.3"""; \
-  Flags: shellexec waituntilterminated; StatusMsg: "Installing Ruby"; Components: "toolbelt/client"
-; 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;