gem2exe 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97b38555a372b2b0c11df30fb582e5972c7303be11739699b73e09f6c29c5630
-  data.tar.gz: 071321bced7fefe7376adea68eec4817a3fd5ccb0450c809b8fe3bbd7d482c3f
+  metadata.gz: e3bc1d21a1b618248edd3575d5041b358e5dacf97dc7d25c9cf6ec5e1c93f541
+  data.tar.gz: f0cd12d5a6ac070fafc7cb3a93b97d8cd5d07c888aab759ed3efc6be42e7f84f
 SHA512:
-  metadata.gz: c49f85d1de61cb458f5c1a6a8c011a55147f9e6fb5563bd5f5f946332225162b1ddc5f1fab79ed2ee9be8533e95ecf75acbf45cf306495cd82d392ac01ae1c94
-  data.tar.gz: 6964e9996c450167a91f097cdb2f3d716219aeda4cecc9b0761087be185ec704a395de9282bb4637a27fcc29ef084c5830fb8c5b56e319a35557f662b5802b92
+  metadata.gz: 6555d1e969916dfe643d869cc99ede65539bc80433f24923e5ebf9655c94df85b6365baf391eac5c7b41fc779ed37e7b143e6e7c5db11a0d52572d1eb860b7a4
+  data.tar.gz: 8214ca656546373782e50e0d6c061a3d7fa1063e6d7ee1ea408727bd01791974c76339807ed2cc6770f87b2b7599b5058b6f48162b873e2dad24bca750aa77f6

data/.travis.yml

@@ -1,28 +1,54 @@
-sudo: true
+stages:
+  - name: binary
+    if: tag IS present
 
-services:
-  - docker
+jobs:
+  include:
+    - stage: binary
+      os: linux
 
-env:
-  - DOCKER_COMPOSE_VERSION=1.23.2
+      sudo: required
+      services:
+        - docker
 
-before_install:
-  - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
-script:
-  - docker-compose build
-  - docker create --name gem2exe mattipaksula/gem2exe
-  - mkdir releases
-  - docker cp gem2exe:/app/gem2exe releases/gem2exe-linux-amd64-${TRAVIS_TAG}
-  - gzip releases/gem2exe-linux-amd64-${TRAVIS_TAG}
+      before_install:
+        - sudo rm /usr/local/bin/docker-compose
+        - curl -L https://github.com/docker/compose/releases/download/1.23.2/docker-compose-`uname -s`-`uname -m` > docker-compose
+        - chmod +x docker-compose
+        - sudo mv docker-compose /usr/local/bin
+      script:
+        - docker-compose build
+        - docker create --name gem2exe gem2exe
+        - mkdir releases
+        - docker cp gem2exe:/usr/local/bin/gem2exe releases/gem2exe-linux-amd64-${TRAVIS_TAG}
+        - chmod a+x releases/gem2exe-linux-amd64-${TRAVIS_TAG}
+        - gzip releases/*
+
+    - stage: binary
+      os: osx
+      rvm:
+        - "2.6"
+      script:
+        - gem update --system
+        - bundle install
+        - bundle exec rake
+        - bundle exec rake install
+        - bundle exec gem2exe setup
+        - bundle exec gem2exe local --out releases/gem2exe-darwin-amd64-${TRAVIS_TAG} gem2exe
+        - chmod a+x releases/gem2exe-darwin-amd64-${TRAVIS_TAG}
+        - gzip releases/*
 
 deploy:
-  provider: releases
-  api_key: "GITHUB OAUTH TOKEN"
-  file_glob: true
-  file: releases/*
-  skip_cleanup: true
-  on:
-    tags: true
+  - provider: releases
+    api_key:
+      secure: "d0uXeYO/b1yb/9NgUAlUqAqDgfCgGLxPork1qIaJ5fuK0UMtqKvJp40jLhpoiGjGrc+YvVJ55otlxH5PBnofW/QaEGYJVtWMi54VZlddsszYk6wfsVQFFgVdtGVly//ImfjEIobdEBVzJp+IjX7OA6EXriCH9VxpdwC+gEL8Fi2jyxmTtM/x16ONGxYYzImrXL5iQj8ETUgPkElVaoAm9JceApnu3iwEMR1R+U9zeWUYvBYCjehg1aKkPy42Grm5m9rsYMeQ+DossCPu873lZBl3L9Pj2BpRoBVZsAaXCwARRlfh9B5lMMWVxaf7SDrk0o7r+nSGaV3BywxuM5P0JNOBeh4z3bf/CWelMF7oSC04dgNwZbvv9YR6j+gQqFpXTU74AYVLf3Zt8b5iY30z/JQtyoWcX+QVyTrfgVsoZjjzzqdEFlbjClhYUHsV2gtqixy/78EsqDkLuLL3FXcxBNd//hwBvgUJSIBqlb4Ecnfu1bxLVW/xHUQReklFAv5XhNJSAlrzLVdRdaBnFS3zjxJ11VHVZH1b+gTbBXWG3iUtS5wWZV5MmcOrc5QdZQOgtVfnmW0pRoGUzrA4S/QLUkzuhcYFodvv19UTyO9mDQgf3K9+sJ3XtcUKiTcHmg1WzFp35BGi6PVhXTtgg2LcsmHhkGxMuCu0S/ksX2mXoZw="
+    file_glob: true
+    file: releases/*
+    skip_cleanup: true
+    on:
+      tags: true
+  - provider: rubygems
+    api_key:
+      secure: "oNnsB58gFTwkBu+XpxhnFGfaMBonKghmh08NnH4naPmOH4aOkCwI2CB7UIBKq3dmZlfO9h67nVyQ9NvDVhmOrsSxkudzluIZ0RXiaz57YuWYP21j7TeyssuQIUaXEBbRuE/wb85rdYtRY+je6/vJjVZoRk524/VnWBf+guIRTY6yZWBzxwn/zECZsQgL7i9rXbaFO2Sm5XRDW//hwiIijqdBjQ3zvWeMSKh2in0GgCgbVmarYxFAV8bTXUgCOQIDM9Je4Q647430p8VpQ9kbhhSF2bdJVeeuUIMdnTel+OGjdejMoSEHIyRB1+QjPGKKXzx8JSOcON7C78af0lyZf6NEtJK4DnHfA6OJORhNSL4xvHvxlR20iiCuplOnLujzBppxnkA25ck4R5OodXkYUVT8dL+z6S2kDsnkiQ25frdHBks9MDD4AumdezhM06NbLWdwhJbN8D0B47z14ZSXOQ1zNYg2mqVidZS/qhbtlQEib70jIgGquj17ETEgTTSiyI0C5myc/rkLc1UYs8rKT7fY5VGeaaFmyHC/oQWSaM709rAJe35UvyYo6mTMBI6g/Vy8jmh1ZodXlzJE/CXfAkTI6s/zP2rABlnz3hxggE95ZEDrlO8q7v/njXGGpPjTH8HtAkqNzBDJEDRXPpB2jBuhhx75ho1YlCVYJj2lpOY="
+    on:
+      branch: master

data/Dockerfile

@@ -1,19 +1,17 @@
 FROM ruby:2.6.0 as builder
 
-RUN apt-get update && apt-get install -y squashfs-tools build-essential bison curl openssl
-
-RUN curl -sL https://github.com/kontena/ruby-packer/releases/download/0.5.0%2Bextra7/rubyc-0.5.0+extra7-linux-amd64.gz | gunzip > /usr/local/bin/rubyc
-RUN chmod +x /usr/local/bin/rubyc
-
-RUN update-ca-certificates
-
-WORKDIR /app
+WORKDIR /build
 COPY . .
 
-RUN rubyc --openssl-dir=/etc/ssl -o gem2exe -d /tmp/build --make-args="-j$((`nproc`+1))" gem2exe
+RUN bundle install
+RUN rake
+RUN rake install
+RUN gem2exe setup
+RUN gem2exe local gem2exe
 
 # -----------
 FROM ubuntu:18.04
-COPY --from=builder /app/gem2exe /usr/local/bin
+RUN apt-get update && apt-get install -y git-core
+COPY --from=builder /build/gem2exe /usr/local/bin
 RUN /usr/local/bin/gem2exe setup
 ENTRYPOINT [ "/usr/local/bin/gem2exe" ]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gem2exe (0.1.0)
+    gem2exe (0.3.0)
       clamp (= 1.3.0)
 
 GEM
@@ -29,9 +29,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
+  gem2exe!
   rake (~> 10.0)
   rspec (~> 3.0)
-  gem2exe!
 
 BUNDLED WITH
    1.16.6

data/README.md

@@ -1,39 +1,21 @@
-# Gem2exe
+# gem2exe
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/gem2exe`. To experiment with that code, run `bin/console` for an interactive prompt.
+Uses https://github.com/kontena/ruby-packer/releases
 
-TODO: Delete this and the text above, and describe your gem
+## local gems
 
-## Installation
+Building a local gem:
 
-Add this line to your application's Gemfile:
+        cd yourgem
+        gem2exe local command-to-start-gem
 
-```ruby
-gem 'gem2exe'
-```
+Full options:
 
-And then execute:
+        gem2exe local --path /path/to/your/gem \
+            --out /build/name \
+            --cache-dir /tmp/cache \
+            command-to-start-gem
 
-    $ bundle
+## remote gems
 
-Or install it yourself as:
-
-    $ gem install gem2exe
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/gem2exe.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+        TODO

data/docker-compose.yml

@@ -2,5 +2,5 @@ version: '3.7'
 
 services:
   gem2exe:
+    image: gem2exe
     build: .
-    image: mattipaksula/gem2exe

data/exe/gem2exe

@@ -8,6 +8,6 @@ require 'pathname'
 lib_path = File.expand_path('../../lib', Pathname.new(__FILE__).realpath)
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 
-require 'Gem2exe'
-require 'Gem2exe/cli'
+require 'gem2exe'
+require 'gem2exe/cli'
 Gem2exe::Cli::RootCommand.run

data/lib/gem2exe/builder.rb

@@ -0,0 +1,42 @@
+require "tmpdir"
+require "fileutils"
+module Gem2exe
+  class Builder
+    def initialize(path:,entrypoint:,out:,cores:nil,cache_dir:nil)
+      @path = path
+      @entrypoint = entrypoint
+      @out = out
+      @cores = (cores || self.cores+1)
+      @tmpdir = (cache_dir || Dir.mktmpdir)
+    end
+
+    def build
+      FileUtils.mkdir_p File.dirname(@out)
+
+      cmd = [Gem2exe.rubyc_path]
+      if Gem2exe.platform == "darwin"
+        cmd += ["--openssl-dir", "/usr/local/etc/openssl"]
+      else
+        cmd += ["--openssl-dir", "/etc/ssl"]
+      end
+      cmd += ["--root", @path]
+      cmd += ["-o", @out]
+      cmd += ["-d", @tmpdir]
+      cmd += ["--make-args", "-j#{@cores}"]
+      cmd += [@entrypoint]
+
+      Runner.run! cmd, output: true
+    end
+
+
+    protected
+
+    def cores
+      if Gem2exe.platform == "darwin"
+        Integer(`sysctl -n hw.ncpu`)
+      else
+        Integer(`nproc`)
+      end
+    end
+  end
+end

data/lib/gem2exe/cli/local_command.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Gem2exe
+  module Cli
+    class LocalCommand < Clamp::Command
+      parameter "ENTRYPOINT", "entrypoint"
+      option "--cache-dir", "CACHE_DIR", "build cache dir"
+      option "--path", "PATH", "path to gem, defaults to working directory"
+      option "--out", "OUT", "executable, defaults to entrypoint"
+
+      def execute
+        Gem2exe.ensure_setup
+
+        out_with_path = out || entrypoint
+
+        path_expanded = if path
+          File.expand_path(path)
+        else
+          Dir.pwd
+        end
+
+        builder = Builder.new path: path_expanded, entrypoint: entrypoint, out: out_with_path, cache_dir: cache_dir
+        builder.build
+      end
+    end
+  end
+end

data/lib/gem2exe/cli/remote_command.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Gem2exe
+  module Cli
+    class RemoteCommand < Clamp::Command
+      parameter "GEM", "gem"
+      parameter "VERSION", "version"
+      parameter "ENTRYPOINT", "entrypoint"
+
+      option "--cache-dir", "CACHE_DIR", "build cache dir"
+      option "--out", "OUT", "executable, defaults to entrypoint"
+
+      def execute
+        Gem2exe.ensure_setup
+        out_with_path = out || entrypoint
+
+        unpacker = Unpacker.new gem: gem, version: version
+        unpacker.unpack
+
+        builder = Builder.new path: unpacker.path, entrypoint: entrypoint, out: out_with_path, cache_dir: cache_dir
+        builder.build
+      end
+    end
+  end
+end

data/lib/gem2exe/cli/root_command.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "build_command"
-
 module Gem2exe
   module Cli
     class RootCommand < Clamp::Command
@@ -15,7 +13,9 @@ module Gem2exe
       subcommand ["setup"], "setup", SetupCommand
       subcommand ["uninstall"], "uninstall", UninstallCommand
 
-      subcommand ["build"], "build", BuildCommand
+      subcommand ["local"], "local", LocalCommand
+      subcommand ["remote"], "remote", RemoteCommand
+
       subcommand ["version"], "Show version information", VersionCommand
 
       def self.run

data/lib/gem2exe/cli/setup_command.rb

@@ -3,10 +3,39 @@
 module Gem2exe
   module Cli
     class SetupCommand < Clamp::Command
+      option "--sudo", :flag, "use sudo"
+
       def execute
-        Gem2exe.ensure_rubyc
+        $stderr.puts "installing dependencies ..."
+
+        if Gem2exe.platform == "darwin"
+          runner_opts = {
+            shell: true, output: true, prepend: {
+              stdboth: "  brew: "
+            }
+          }
+
+          Runner.run! "brew install squashfs || brew upgrade squashfs || true", runner_opts
+          Runner.run! "brew install openssl || brew upgrade openssl || true", runner_opts
+          Runner.run! "curl -sL https://curl.haxx.se/ca/cacert.pem > /usr/local/etc/openssl/cacert.pem", runner_opts
+        else
+          runner_opts = {
+            sudo: sudo?, shell: true, output: true, prepend: {
+              stdboth: "  apt-get: "
+            }
+          }
+          $stderr.puts "installing dependencies with apt-get ..."
+          Runner.run! "apt-get update", runner_opts
+          Runner.run! "apt-get install -y ruby squashfs-tools build-essential bison curl", runner_opts
+        end
+        $stderr.puts "... dependencies installed"
+
+        $stderr.puts "installing rubyc ..."
+        Gem2exe.download_rubyc
+        $stderr.puts "... rubyc installed"
 
-        puts "ready"
+        puts ""
+        puts "setup ok"
       end
     end
   end

data/lib/gem2exe/cli.rb

@@ -1,8 +1,11 @@
 require 'clamp'
+Clamp.allow_options_after_parameters = true
 
 require_relative "cli/version_command"
 require_relative "cli/setup_command"
 require_relative "cli/uninstall_command"
 
-require_relative "cli/build_command"
+require_relative "cli/local_command"
+require_relative "cli/remote_command"
+
 require_relative "cli/root_command"

data/lib/gem2exe/runner.rb

@@ -0,0 +1,102 @@
+require "open3"
+
+module Gem2exe
+  class RunnerError < StandardError
+  end
+  class RunnerBuffer
+    def initialize
+      @buffer = []
+    end
+
+    def <<(c)
+      @buffer << c
+    end
+
+    def to_s
+      @buffer.join ""
+    end
+
+    def method_missing(m, *args, &block)
+      to_s.send m, *args, block
+    end
+  end
+
+  class Runner
+    def initialize(cmd, env:nil, shell:false, sudo:false, chdir:nil, output:false,prepend:{})
+      cmd.insert(0, "sudo") if sudo
+      @cmd = if shell
+        ["sh","-c"] + [cmd.join(" ")]
+      else
+        cmd
+      end
+
+      @env = (env || {})
+      @opts = {}
+      @opts[:chdir] = chdir if chdir
+      @output = output
+      @prepend = {}
+      if prepend[:stdboth]
+        @prepend[:stderr] = prepend[:stdboth]
+        @prepend[:stdout] = prepend[:stdboth]
+      else
+        @prepend = prepend
+      end
+
+      @status, @stdout, @stderr, @stdboth = nil, RunnerBuffer.new, RunnerBuffer.new, RunnerBuffer.new
+    end
+    attr_reader :status, :stdout, :stderr, :stdboth
+
+    def self.run!(cmd_string_or_array, opts={})
+      cmd = if cmd_string_or_array.is_a? Array
+        cmd_string_or_array
+      else
+        cmd_string_or_array.split(" ")
+      end
+
+      runner = self.new cmd, opts
+      runner.run
+
+      if runner.status.exitstatus != 0
+        exit 1
+      end
+
+      runner
+    end
+
+    def run
+      executable, *args = @cmd
+      stdin, stdout, stderr, wait_thr = Open3.popen3(@env, executable, *args, @opts)
+
+      stderr_thr = Thread.new do
+        stderr.each do |line|
+          @stdboth << line
+          @stderr << line
+          if @prepend[:stderr]
+            $stdout.print @prepend[:stderr]+line
+          else
+            $stdout.print line
+          end
+        end
+      end
+
+      stdout_thr = Thread.new do
+        stdout.each do |line|
+          @stdboth << line
+          @stderr << line
+
+          if @prepend[:stdout]
+            $stdout.print @prepend[:stdout]+line
+          else
+            $stdout.print line
+          end
+        end
+      end
+
+      wait_thr.join
+      stdout_thr.join
+      stderr_thr.join
+
+      @status = wait_thr.value
+    end
+  end
+end

data/lib/gem2exe/unpacker.rb

@@ -0,0 +1,27 @@
+require "tmpdir"
+
+module Gem2exe
+  class Unpacker
+    def initialize(gem:,version:)
+      @gem = gem
+      @version = version
+      @tmpdir = Dir.mktmpdir
+      @path = File.join(
+        @tmpdir,
+        "#{@gem}-#{@version}"
+      )
+    end
+    attr_reader :path
+
+    def unpack
+      cmd = ["gem", "unpack", @gem, "-v", @version]
+
+      r = Runner.run! cmd, chdir: @tmpdir, output: true
+      unless r.stderr.start_with? "Unpacked gem:"
+        exit 1
+      end
+
+      self
+    end
+  end
+end

data/lib/gem2exe/version.rb

@@ -1,3 +1,3 @@
 module Gem2exe
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

data/lib/gem2exe.rb

@@ -1,31 +1,35 @@
 require "fileutils"
 
 module Gem2exe
-  def self.cores
-    Integer(`sysctl -n hw.ncpu`)
-  end
-
   def self.uninstall
     FileUtils.rm_rf install_path
   end
 
-  def self.ensure_rubyc
-    return if File.exists? self.rubyc_path
+  def self.download_rubyc
+    return if File.exist? rubyc_path
     FileUtils.mkdir_p File.dirname(self.rubyc_path)
 
     rubyc_url = if self.platform == "darwin"
-#      "https://github.com/kontena/ruby-packer/releases/download/2.6.0-0.6.0/rubyc-2.6.0-0.6.0-osx-amd64.gz"
-      "https://dl.bintray.com/kontena/ruby-packer/0.5.0-dev/rubyc-0.5.0-extra2-darwin-amd64.gz"
+      "https://github.com/kontena/ruby-packer/releases/download/2.6.0-0.6.0/rubyc-2.6.0-0.6.0-osx-amd64.gz"
     else
       "https://github.com/kontena/ruby-packer/releases/download/2.6.0-0.6.0/rubyc-2.6.0-0.6.0-linux-amd64.gz"
     end
 
     $stderr.puts "downloading rubyc from #{rubyc_url}"
-    `sh -c "curl -sL #{rubyc_url} | gunzip > #{self.rubyc_path}"`
-    `chmod +x #{self.rubyc_path}`
+
+    Runner.run! "curl -sL #{rubyc_url} | gunzip > #{self.rubyc_path}", shell: true
+    Runner.run! "chmod +x #{self.rubyc_path}"
+
     $stderr.puts "installed in #{self.rubyc_path}"
   end
 
+  def self.ensure_setup
+    unless File.exists? self.rubyc_path
+      $stderr.puts "rubyc not found - run: gem2exe setup"
+      exit 1
+    end
+  end
+
   def self.rubyc_path
     install_path_parts = [self.install_path]
     install_path_parts << self.platform
@@ -48,3 +52,6 @@ module Gem2exe
 end
 
 require_relative "gem2exe/version"
+require_relative "gem2exe/builder"
+require_relative "gem2exe/unpacker"
+require_relative "gem2exe/runner"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem2exe
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-20 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -89,12 +89,16 @@ files:
 - exe/gem2exe
 - gem2exe.gemspec
 - lib/gem2exe.rb
+- lib/gem2exe/builder.rb
 - lib/gem2exe/cli.rb
-- lib/gem2exe/cli/build_command.rb
+- lib/gem2exe/cli/local_command.rb
+- lib/gem2exe/cli/remote_command.rb
 - lib/gem2exe/cli/root_command.rb
 - lib/gem2exe/cli/setup_command.rb
 - lib/gem2exe/cli/uninstall_command.rb
 - lib/gem2exe/cli/version_command.rb
+- lib/gem2exe/runner.rb
+- lib/gem2exe/unpacker.rb
 - lib/gem2exe/version.rb
 homepage: https://github.com/matti/gem2exe
 licenses:

data/lib/gem2exe/cli/build_command.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require "tmpdir"
-
-module Gem2exe
-  module Cli
-    class BuildCommand < Clamp::Command
-      parameter "NAME", "name"
-      option "--cache-dir", "CACHE_DIR", "build cache dir"
-
-      def execute
-        cores = Gem2exe.cores + 1
-        tmpdir = if cache_dir
-          cache_dir
-        else
-          Dir.mktmpdir
-        end
-
-        if Gem2exe.platform == "darwin"
-          `"#{Gem2exe.rubyc_path}" --openssl-dir=/usr/local/etc/openssl -o "#{name}" -d "#{tmpdir}" --make-args="-j#{cores} --silent" #{name}`
-        else
-          `"#{Gem2exe.rubyc_path}" --openssl-dir=/etc/ssl rubyc -o "#{name}" -d "#{tmpdir}"  --make-args="-j#{cores}" #{name}`
-        end
-      end
-    end
-  end
-end