datapimp 1.0.21 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76a376d4d5aca8e6c6240d3f2252520238854741
-  data.tar.gz: 6c774cd29b309b0aba67676d7abe6f3a233f2753
+  metadata.gz: 6076cec529a2e10ceaccd9b51291f511946f6aee
+  data.tar.gz: 0fdd88c5bcf45d343c00f63f85b629ab313d660b
 SHA512:
-  metadata.gz: 8549fd8985afda0fc111cfc619d13d92c434ce9d5e7fc57de4eb46a8f3392ae4e737abd2b49cbc97f7bab14875ad908fbca3b4485f54c3ceedac6317e0c1c0db
-  data.tar.gz: abe52016c5d57a18fafe40464f6ec8a4a80013698d047ebc70c3982913d7a9e2059fc001d9e452cdacb9fa4de4c7eda1051830af06aa308585d719fc21a11693
+  metadata.gz: 0dafbe57528a934ee0a8b4b5a1ff6f1d3e3a28b324cbc9904970b7f525c27f984d31a6b4bcc824d747d43c2c5e89f11e77102a332f1f58fb43c35e90b7664021
+  data.tar.gz: 74d9a01fe86da6fd9bee2f1e63eaacc2a93ea86acbddbcccfdf59a57cddba58f1d3b7a4124b6ceae87fbb25d79c03bda76b32905ce37b496194043cad61691df

data/Rakefile

@@ -3,17 +3,17 @@ Dir[File.join(Dir.pwd, 'tasks', '*.rake')].each { |f| load f }
 
 require "bundler/gem_tasks"
 
-Distribution.configure do |config|
-  config.package_name = 'datapimp'
-  config.version = Datapimp::VERSION
-  config.rb_version = '20150210-2.1.5'
-  config.packaging_dir = File.expand_path 'packaging'
-  config.native_extensions = [
-    'escape_utils-1.0.1',
-    'nokogiri-1.6.5',
-    'unf_ext-1.0.6'
-  ]
-end
+#Distribution.configure do |config|
+#  config.package_name = 'datapimp'
+#  config.version = Datapimp::VERSION
+#  config.rb_version = '20150210-2.1.5'
+#  config.packaging_dir = File.expand_path 'packaging'
+#  config.native_extensions = [
+#    'escape_utils-1.0.1',
+#    'nokogiri-1.6.5',
+#    'unf_ext-1.0.6'
+#  ]
+#end
 
 task :default do
   puts "Sup?"

data/lib/datapimp/cli/create.rb

@@ -115,7 +115,7 @@ command 'create cloudfront distribution' do |c|
 
     distributions = Datapimp::Sync.amazon.cdn.distributions
 
-    distribution_id = distributions.find {|d| d.comment == options.bucket }.id
+    distribution_id = distributions.find {|d| d.comment == options.bucket }.try(:id)
 
     if !distribution_id
       distribution = Datapimp::Sync.amazon.cdn.distributions.create(cdn_options)

data/lib/datapimp/version.rb

@@ -1,3 +1,3 @@
 module Datapimp
-  VERSION = "1.0.21"
+  VERSION = "1.0.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datapimp
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.22
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -425,20 +425,8 @@ files:
 - lib/datapimp/sync/s3_bucket.rb
 - lib/datapimp/util.rb
 - lib/datapimp/version.rb
-- packaging/wrapper.sh
 - spec/spec_helper.rb
 - spec/support/test_helpers.rb
-- tasks/distribution/configuration.rb
-- tasks/distribution/executable.rb
-- tasks/distribution/package.rb
-- tasks/distribution/package_helpers.rb
-- tasks/distribution/release.rb
-- tasks/distribution/release_notes.erb
-- tasks/distribution/release_notes.rb
-- tasks/distribution/tarball.rb
-- tasks/distribution/travelling_ruby.rb
-- tasks/package.rake
-- tasks/upload.rake
 homepage: https://github.com/datapimp/datapimp
 licenses:
 - MIT

data/packaging/wrapper.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-export DATAPIMP_PWD=$PWD
-set -e
-
-TARGET_FILE=$0
-
-cd `dirname $TARGET_FILE`
-TARGET_FILE=`basename $TARGET_FILE`
-
-# Iterate down a (possible) chain of symlinks
-while [ -L "$TARGET_FILE" ]
-do
-    TARGET_FILE=`readlink $TARGET_FILE`
-    cd `dirname $TARGET_FILE`
-    TARGET_FILE=`basename $TARGET_FILE`
-done
-
-# Compute the canonicalized name by finding the physical path
-# for the directory we're in and appending the target file.
-PHYS_DIR=`pwd -P`
-RESULT=$PHYS_DIR/$TARGET_FILE
-
-# Figure out where this script is located.
-SELFDIR=$(dirname "$RESULT")
-
-# Tell Bundler where the Gemfile and gems are.
-export BUNDLE_GEMFILE="$SELFDIR/lib/app/Gemfile"
-unset BUNDLE_IGNORE_CONFIG
-
-# Run the actual app using the bundled Ruby interpreter.
-exec "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup "$SELFDIR/lib/app/bin/datapimp" "$@"

data/tasks/distribution/configuration.rb

@@ -1,15 +0,0 @@
-module Distribution
-  class << self
-    attr_accessor :configuration
-  end
-
-  def self.configure
-    self.configuration ||= Configuration.new
-    yield configuration
-  end
-
-  class Configuration
-    attr_accessor :package_name, :packaging_dir, :version, :rb_version,
-                  :native_extensions
-  end
-end

data/tasks/distribution/executable.rb

@@ -1,28 +0,0 @@
-Dir[File.join(Dir.pwd, 'tasks', '**', '*.rb')].each { |f| require f }
-
-module Distribution
-  class Executable
-    include PackageHelpers
-    extend Forwardable
-
-    attr_reader :package
-
-    def_delegators :@package, :dir, :package_name
-
-    def initialize(package)
-      @package = package
-    end
-
-    def self.create(package)
-      executable = new(package)
-      executable.copy_wrapper
-      executable
-    end
-
-    def copy_wrapper
-      print_to_console 'Creating exexutable...'
-
-      FileUtils.cp 'packaging/wrapper.sh', "#{dir}/#{package_name}"
-    end
-  end
-end

data/tasks/distribution/package.rb

@@ -1,85 +0,0 @@
-require 'fileutils'
-require 'forwardable'
-
-Dir[File.join(Dir.pwd, 'tasks', '**', '*.rb')].each { |f| require f }
-
-module Distribution
-  class Package
-    extend Forwardable
-    include PackageHelpers
-
-    attr_reader :config, :dir, :tarball, :package, :arch, :root
-
-    def_delegators :@config, :version, :rb_version, :package_name,
-                   :packaging_dir, :native_extensions
-
-    def initialize(arch)
-      abort 'Ruby 2.1.x required' if RUBY_VERSION !~ /^2\.1\./
-
-      @arch = arch
-      @config = ::Distribution.configuration
-      @dir = "#{package_name}-#{version}-#{arch}"
-      @package = self
-      @root = File.expand_path '.'
-    end
-
-    def self.create(args)
-      new(*args).build
-    end
-
-    def build
-      initialize_install_dir
-      copy_datapimp
-      install_ruby_and_gems
-      create_executable
-      post_cleanup
-      @tarball = create_tarball
-      clean_dir
-    end
-
-    private
-
-    def clean_dir
-      FileUtils.cd root do
-        FileUtils.remove_dir(dir, true) if Dir.exist? dir
-      end
-    end
-
-    def post_cleanup
-      print_to_console 'Cleaning up...'
-
-      files = ["#{packaging_dir}/traveling-ruby-#{rb_version}-#{arch}.tar.gz"]
-
-      files.each { |file| FileUtils.rm file if File.exist? file }
-    end
-
-    def create_tarball
-      Tarball.new self
-    end
-
-    def create_executable
-      Executable.create self
-    end
-
-    def install_ruby_and_gems
-      TravellingRuby.install self
-    end
-
-    def initialize_install_dir
-      clean_dir
-
-      FileUtils.cd root do
-        FileUtils.mkdir_p "#{dir}/lib/app"
-      end
-    end
-
-    def copy_datapimp
-      print_to_console 'Copying datapimp...'
-
-      %w(datapimp.gemspec Gemfile Gemfile.lock lib bin)
-        .each do |folder|
-        FileUtils.cp_r File.join(root, folder), "#{dir}/lib/app"
-      end
-    end
-  end
-end

data/tasks/distribution/package_helpers.rb

@@ -1,12 +0,0 @@
-module Distribution
-  module PackageHelpers
-    def curl(file)
-      system "curl -L -O --fail --silent #{file}"
-    end
-
-    def print_to_console(msg)
-      arch = package.arch
-      puts "[#{arch}]:" + ' ' * (16 - arch.size) + '=>' + ' ' + msg
-    end
-  end
-end

data/tasks/distribution/release.rb

@@ -1,49 +0,0 @@
-Dir[File.join(Dir.pwd, 'tasks', '**', '*.rb')].each { |f| require f }
-
-require 'digest'
-require 'octokit'
-require 'pathname'
-
-module Distribution
-  class Release
-    extend Forwardable
-    include PackageHelpers
-
-    attr_reader :tarball, :github, :package
-
-    def_delegators :@tarball, :package, :version, :file
-
-    def initialize(tarball)
-      @tarball = tarball
-      @github = Octokit::Client.new access_token: ENV['OCTODOWN_TOKEN']
-    end
-
-    def self.create(tarball)
-      release = new(tarball)
-      release.create_new_release
-    end
-
-    def create_new_release
-      print_to_console 'Publishing release to GitHub...'
-      github.create_release(
-        'datapimp/datapimp',
-        "v#{version}",
-        name: "v#{version}",
-        body: ReleaseNotes.new.content
-      )
-    end
-
-    def upload_asset
-      print_to_console 'Uploading to GitHub...'
-      github.upload_asset find_upload_url, file
-    end
-
-    private
-
-    def find_upload_url
-      Octokit.releases('datapimp/datapimp').find do |n|
-        n.tag_name == "v#{version}"
-      end[:url]
-    end
-  end
-end

data/tasks/distribution/release_notes.erb

@@ -1,14 +0,0 @@
-# Brief <%= version %>
-
-Cheers to another great release!
-
-## Contributors
-
-Thank you too all of you fabulous contributors! :clap:
-
-<%= committers %>
-
-## SHA256 Sums
-
-```
-<%= shasums %>```

data/tasks/distribution/release_notes.rb

@@ -1,62 +0,0 @@
-Dir[File.join(Dir.pwd, 'tasks', '**', '*.rb')].each { |f| require f }
-
-require 'digest'
-require 'erb'
-require 'octokit'
-
-module Distribution
-  class ReleaseNotes
-    attr_reader :version, :content, :github
-
-    def initialize
-      @version = `git tag | tail -1`.strip
-      @github = Octokit::Client.new access_token: ENV['OCTODOWN_TOKEN']
-      @content = render_template
-    end
-
-    private
-
-    def render_template
-      template_text = File.read 'tasks/distribution/release_notes.erb'
-      erb_template = ERB.new template_text
-      erb_template.result binding
-    end
-
-    # Show our committers
-    def committers
-      committer_logins_for(contributor_emails)
-        .map { |str| "- @#{str}" }
-        .join "\n"
-    end
-
-    def contributor_emails
-      `git log #{prev_release}.. --format="%aE"`
-        .split("\n")
-        .uniq
-    end
-
-    def committer_logins_for(emails)
-      emails.map do |email|
-        github.search_users("#{email} in:email")
-          .items
-          .first
-          .login
-      end
-    end
-
-    def prev_release
-      `git tag | tail -2 | head -1`.strip
-    end
-
-    def shasums
-      Dir['distro/*'].reduce '' do |a, e|
-        [].tap do |arr|
-          arr << a
-          arr << "#{File.basename e}: "
-          arr << ' ' * (36 - arr[1].size)
-          arr << "#{Digest::SHA256.hexdigest File.read(e)}\n"
-        end.join
-      end
-    end
-  end
-end

data/tasks/distribution/tarball.rb

@@ -1,47 +0,0 @@
-Dir[File.join(Dir.pwd, 'tasks', '**', '*.rb')].each { |f| require f }
-
-module Distribution
-  class Tarball
-    include PackageHelpers
-    extend Forwardable
-
-    attr_accessor :arch, :file, :version, :dir, :package
-
-    def_delegators :@package, :arch, :dir
-
-    def initialize(package)
-      @package = package
-      @file = search || build
-      @version = extract_version
-    end
-
-    def self.upload(package)
-      new(package).to_github
-    end
-
-    def to_github
-      Release.new(self).upload_asset
-    end
-
-    def build
-      print_to_console 'Creating tarball...'
-
-      FileUtils.mkdir_p 'distro'
-      system "tar -czf distro/#{dir}.tar.gz #{dir} > /dev/null"
-      FileUtils.remove_dir "#{dir}", true
-
-      File.new "distro/#{dir}.tar.gz"
-    end
-
-    private
-
-    def search
-      ball = Dir['distro/*.tar.gz'].find { |n| n.include? "#{arch}.tar.gz" }
-      File.new ball unless ball.nil?
-    end
-
-    def extract_version
-      file.path.match(/\*|\d+(\.\d+){0,2}(\.\*)?/)[0]
-    end
-  end
-end

data/tasks/distribution/travelling_ruby.rb

@@ -1,87 +0,0 @@
-Dir[File.join(Dir.pwd, 'tasks', '**', '*.rb')].each { |f| require f }
-
-module Distribution
-  class TravellingRuby
-    attr_reader :package
-
-    include PackageHelpers
-
-    def initialize(package)
-      @package = package
-    end
-
-    def self.install(package)
-      new(package)
-        .tap(&:download_runtime)
-        .tap(&:extract_to_folder)
-        .tap(&:install_gems)
-        .tap(&:install_native_extensions)
-        .tap(&:cleanup_files)
-    end
-
-    def install_gems
-      print_to_console 'Installing Gems...'
-
-      Bundler.with_clean_env do
-        FileUtils.cd "#{package.dir}/lib/app" do
-          system(
-            'BUNDLE_IGNORE_CONFIG=1 bundle install ' \
-            '--path vendor --without development --jobs 2 ' \
-            '--quiet'
-          )
-        end
-      end
-    end
-
-    def extract_to_folder
-      FileUtils.mkdir "#{package.dir}/lib/ruby"
-
-      system(
-        "tar -xzf packaging/traveling-ruby-#{package.rb_version}-" \
-        "#{package.arch}.tar.gz " \
-        "-C #{package.dir}/lib/ruby " \
-        '&> /dev/null'
-      )
-    end
-
-    def download_runtime
-      print_to_console 'Downloading Ruby...'
-      ruby = "traveling-ruby-#{package.rb_version}-#{package.arch}.tar.gz"
-
-      FileUtils.cd Distribution.configuration.packaging_dir do
-        unless File.exist? ruby
-          curl "http://d6r77u77i8pq3.cloudfront.net/releases/#{ruby}"
-        end
-      end
-    end
-
-    def install_native_extensions
-      clean_old_extensions
-
-      package.native_extensions.each do |ext|
-        FileUtils.cd "#{package.dir}/lib/app/vendor/ruby/2.1.0/extensions" do
-          curl 'http://d6r77u77i8pq3.cloudfront.net/releases/' \
-               "traveling-ruby-gems-#{package.rb_version}-#{package.arch}/" \
-               "#{ext}.tar.gz"
-
-          system "tar xzf #{ext}.tar.gz && rm #{ext}.tar.gz > /dev/null"
-        end
-      end
-    end
-
-    def clean_old_extensions
-      files = Dir['lib/app/vendor/ruby/2.1.0/extensions/**/*']
-      files.each { |file| FileUtils.rm_rf file }
-    end
-
-    def cleanup_files
-      FileUtils.cd package.dir do
-        files  = Dir['**/{test,spec,doc,example,examples,features,benchmark}']
-        files += Dir['**/{tasks,Rakefile}']
-        files += Dir['lib/ruby/lib/ruby/**/darkfish/images/**/*']
-        files += Dir['**/*.{h,c,cpp,rl,java,class,md,rdoc,txt,gif}']
-        files.each { |file| FileUtils.rm_rf file }
-      end
-    end
-  end
-end

data/tasks/package.rake

@@ -1,41 +0,0 @@
-include Distribution
-
-namespace :distribution do
-  desc 'Package octodown into self-contained programs'
-  task :package do
-    %w(linux:x86 linux:x86_64 osx).each do |task|
-      fork do
-        Rake::Task["distribution:package:#{task}"].invoke
-        exit
-      end
-
-      sleep 0.01
-    end
-
-    Process.waitall
-  end
-
-  namespace :package do
-    namespace :linux do
-      desc 'Package for Linux x86'
-      task :x86 do
-        Package.create 'linux-x86'
-      end
-
-      desc 'Package for Linux x86_64'
-      task :x86_64 do
-        Package.create 'linux-x86_64'
-      end
-    end
-
-    desc 'Package for OS X'
-    task :osx do
-      Package.create 'osx'
-    end
-  end
-
-  desc 'Generate release notes'
-  task :release_notes do
-  #  puts ReleaseNotes.new.content
-  end
-end

data/tasks/upload.rake

@@ -1,40 +0,0 @@
-include Distribution
-
-desc 'Upload tarballs to GitHub'
-task :upload do
-  ['upload:linux:x86', 'upload:linux:x86_64', 'upload:osx'].each do |task|
-    begin
-      Release.create Package.new('osx')
-    rescue
-      puts 'Release already uploaded, continuing...'
-    end
-
-    fork do
-      Rake::Task[task].invoke
-      exit
-    end
-
-    sleep 0.01
-  end
-
-  Process.waitall
-end
-
-namespace :upload do
-  namespace :linux do
-    desc 'Upload for Linux x86'
-    task :x86 do
-      Tarball.upload Package.new('x86')
-    end
-
-    desc 'Upload for Linux x86_64'
-    task :x86_64 do
-      Tarball.upload Package.new('x86_64')
-    end
-  end
-
-  desc 'Upload for OS X'
-  task :osx do
-    Tarball.upload Package.new('osx')
-  end
-end