image_optim_pack 0.5.1.20190105-x86-openbsd → 0.5.2-x86-openbsd

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21fa489eadad9fd55802c21ab7a836ddb38a638835fbb47bd6832bef77078c6a
-  data.tar.gz: ea910b271dce22c95e253de6f27469708d8e89ce16a02130da04aff82d8d50ee
+  metadata.gz: 4f3512a0779c9fbe2510d7be88d8872602d4dfd7a04489a93e6627bc5fe492c9
+  data.tar.gz: 001fb47c9d74bcc88ce0041040e72f6f8c246dfb01292ae9bd947a261ace6cfd
 SHA512:
-  metadata.gz: ab32dc164a87f6fba1772267cde1e199954b06bd93caa0b811a99f2f88f6104f8cb8db8f8476780cdf47eefd53b393b1f3736825798273c4616b1b7c5faa3056
-  data.tar.gz: 9c68d85e5eb583be5d37ce894a2fc7bc0ca0393de74d636672a75f3787c9c9b1e0043d3fcccc48e184152f2b7aa411d1fd155e51ce6dab38558356e21a0976aa
+  metadata.gz: 31913c36bbfd4c23f65fb08b8f41fc8d7ea5f24677445cc2c2cfa5652c7185675dce0f1b21479ec7b5f65c203a67205b80dd176d1bce44bf2de4cb0a9fe4104c
+  data.tar.gz: 83e8d19fa56abcefe59f3d8817436aa73118853752d27d12224aff56e77023d4cbcc8c4cd792cf3b8960f83355b9864d315f68495b45bad4a0d3eb507bf4c7ab

data/.travis.yml

@@ -7,19 +7,18 @@ rvm:
   - '2.1.10'
   - '2.2.10'
   - '2.3.8'
-  - '2.4.5'
-  - '2.5.3'
-  - '2.6.0'
-  - 'jruby-9.0.5.0'
+  - '2.4.6'
+  - '2.5.5'
+  - '2.6.2'
   - 'jruby-9.1.9.0'
 script:
   - make test
   - bundle exec image_optim --info
   - bundle exec rspec
 before_install:
-  - gem install bundler || gem install bundler --version '< 2'
-  - ruby -e 'require "rubygems"; require "bundler/inline"; gemfile{ source "https://rubygems.org"; gem "rubygems-update" }' # get compatible version of rubygems-update
+  - gem install rubygems-update || gem install rubygems-update --version '< 3'
   - gem update --system
+  - gem install bundler || gem install bundler --version '< 2'
   - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install imagemagick; fi
   - make ldd-version
 matrix:
@@ -28,16 +27,16 @@ matrix:
       rvm: default
     - os: osx
       rvm: default
-      osx_image: xcode7.3
+      osx_image: xcode8.3
     - os: osx
       rvm: default
-      osx_image: xcode8.3
+      osx_image: xcode9.4
     - os: osx
       rvm: default
-      osx_image: xcode9.3
+      osx_image: xcode10.1
     - env: RUBOCOP=✓
-      rvm: '2.5.3'
+      rvm: '2.6.2'
       script: bundle exec rubocop
     - env: CHECK_RUBIES=✓
-      rvm: '2.5.3'
+      rvm: '2.6.2'
       script: bundle exec travis_check_rubies

data/CHANGELOG.markdown

@@ -2,6 +2,11 @@
 
 ## unreleased
 
+## v0.5.2 (2019-04-10)
+
+* Use libc++ instead of libstdc++ on darwin and set deployment target to 10.7 [#15](https://github.com/toy/image_optim_pack/issues/15) [@toy](https://github.com/toy)
+* Switch to openbsd 5.9 [@toy](https://github.com/toy)
+
 ## v0.5.1.20190105 (2019-01-05)
 
 * jhead 3.03 [@toy](https://github.com/toy)

data/Makefile

@@ -327,8 +327,9 @@ export CPPFLAGS = $(GCC_FLAGS)
 export LDFLAGS = $(GCC_FLAGS)
 
 ifdef IS_DARWIN
-export MACOSX_DEPLOYMENT_TARGET := 10.6
+export MACOSX_DEPLOYMENT_TARGET := 10.7
 GCC_FLAGS += -arch $(ARCH)
+CXXFLAGS += -stdlib=libc++
 endif
 
 ifdef IS_BSD

data/README.markdown

@@ -10,6 +10,8 @@ Precompiled binaries for [`image_optim`](https://github.com/toy/image_optim).
 
 Contains binaries for Mac OS X (>= 10.6, i386 and x86\_64), Linux (i686 and x86\_64), FreeBSD (i386 and amd64) and OpenBSD (i386 and amd64).
 
+A test application with latest `image_optim` and `image_optim_pack` is available on heroku: https://iopack.herokuapp.com/.
+
 ## Binaries and libraries
 
 * [advpng](http://www.advancemame.it/doc-advpng.html) by Andrea Mazzoleni and Filipe Estima ([GNU GPLv3](acknowledgements/advancecomp.txt))

data/Vagrantfile

@@ -48,10 +48,10 @@ Vagrant.configure('2') do |config|
         <<-SH
           set -ex
           pkg_add -z rsync-- ntp gmake gtar-- wget g++-4.8.2p2 autoconf-2.69 automake-1.14.1 libtool nasm
-          path=/home/vagrant/shared
-          mkdir -p $path
-          chown vagrant:vagrant $path
-          ln -nfs $path /vagrant
+          real_workdir_path=/home/vagrant/shared
+          mkdir -p $real_workdir_path
+          chown vagrant:vagrant $real_workdir_path
+          ln -nfs $real_workdir_path /vagrant
         SH
       end
 

data/boxes/Gemfile

@@ -3,9 +3,6 @@ source 'https://rubygems.org'
 gem 'rake'
 
 gem 'veewee', '= 0.4.5.1'
-gem 'dotenv', '~> 2.0'
-gem 'atlas', '~> 1.3'
-gem 'progress', '~> 3.1'
 
 gem 'net-scp'
 gem 'progressbar', '~> 0.21.0'

data/boxes/Rakefile

@@ -1,38 +1,15 @@
-require 'atlas'
-require 'dotenv/tasks'
 require 'pathname'
-require 'progress'
-
-# Show progress when file is read by excon used by atlas
-class BodyProgress # :nodoc:
-  def initialize(path, &block)
-    fail ArgumentError, 'block required' unless block
-
-    @io = File.open(path)
-    Progress.start(path, File.size(path)) do
-      yield self
-    end
-  end
-
-  def size
-    @io.size
-  end
-
-  def read(length)
-    data = @io.read(length)
-    Progress.step data.length if data
-    data
-  end
-end
 
 class Box # :nodoc:
-  attr_reader :definition_path, :definition_dir, :name, :path
+  attr_reader :definition_path, :definition_dir, :name, :path, :groups
 
   def initialize(definition_path)
     @definition_path = Pathname(definition_path)
     @definition_dir = @definition_path.dirname
     @name = @definition_dir.basename.to_s
     @path = Pathname("#{@name}.box")
+    parts = @name.split('-')
+    @groups = (1...parts.length).map{ |n| parts.take(n).join('-') }
   end
 
   def dependencies
@@ -55,26 +32,6 @@ class Box # :nodoc:
     sh(*%W[vagrant box add --force --name boxes/#{path} #{path}])
   end
 
-  def upload(version)
-    assert_box_created
-
-    box = Atlas::Box.create({
-      :username => 'image_optim_pack',
-      :name => name,
-      :short_description => "minimal #{name} (bash, wget) from #{definition[:iso_file]}",
-    })
-
-    version = box.create_version(:version => version)
-
-    provider = version.create_provider(:name => 'virtualbox')
-
-    BodyProgress.new(path) do |f|
-      provider.upload(f)
-    end
-
-    version.release
-  end
-
 private
 
   def definition
@@ -92,49 +49,34 @@ private
   end
 end
 
-task :atlas => :dotenv do
-  token = ENV['ATLAS_TOKEN'].to_s
-  fail 'ATLAS_TOKEN missing' if token.empty?
-
-  Atlas.configure do |config|
-    config.access_token = token
-  end
-end
-
-desc 'build all boxes'
-task :build
-
-desc 'add all boxes to vagrant'
-task :add
-
-desc 'upload all boxes to atlas'
-task :upload
-
-version = Time.now.strftime('%Y%m%d.0.0')
 Dir['definitions/*/definition.rb'].each do |definition_path|
   box = Box.new(definition_path)
 
-  desc "build #{box.path}"
+  desc "build #{box.name} box"
   file box.path => box.dependencies do
     box.build
   end
-  task :build => box.path
 
   namespace :add do
-    desc "add #{box.path}"
+    desc "add #{box.name} box to vagrant"
     task box.name => box.path do
       box.add
     end
   end
-  task :add => "add:#{box.name}"
 
-  namespace :upload do
-    desc "upload #{box.path}"
-    task box.name => [:atlas, box.path] do
-      box.upload(version)
-    end
+  box.groups.each do |group|
+    desc "build #{group} boxes"
+    task "build:#{group}" => box.path
+
+    desc "add #{group} boxes to vagrant"
+    task "add:#{group}" => "add:#{box.name}"
   end
-  task :upload => "upload:#{box.name}"
+
+  desc 'build all boxes'
+  task :build => box.path
+
+  desc 'add all boxes to vagrant'
+  task :add => "add:#{box.name}"
 end
 
 desc 'remove *.box and iso dir'

data/boxes/definitions/openbsd-amd64/definition.rb

@@ -5,50 +5,46 @@ Veewee::Session.declare({
   :disk_format => 'VDI',
   :hostiocache => 'off',
   :os_type_id => 'OpenBSD_64',
-  :iso_file => 'OpenBSD-5.5-amd64.iso',
-  :iso_src => 'https://www.mirrorservice.org/pub/OpenBSD/5.5/amd64/install55.iso',
-  :iso_sha256 => 'cc465ce3f8397883e91c6e1a8a98b1b3507a338984bbfe8978050c5f8fdcaf3f',
+  :iso_file => 'OpenBSD-5.9-amd64.iso',
+  :iso_src => 'https://www.mirrorservice.org/pub/OpenBSD/5.9/amd64/install59.iso',
+  :iso_sha256 => '685262fc665425c61a2952b2820389a2d331ac5558217080e6d564d2ce88eecb',
   :iso_download_timeout => '1000',
   :boot_wait => '50',
   :boot_cmd_sequence => [
     'I<Enter>',             # I - install
     'us<Enter>',            # set the keyboard
-    'OpenBSD55-x64<Enter>', # set the hostname
+    'OpenBSD59-x64<Enter>', # set the hostname
     '<Enter>',              # Which nic to config ? [em0]
     '<Enter>',              # do you want dhcp ? [dhcp]
     '<Wait>' * 5,
-    'none<Enter>',          # IPV6 for em0 ? [none]
-    'done<Enter>',          # Which other nic do you wish to configure [done]
+    '<Enter>',              # IPV6 for em0 ? [none]
+    '<Enter>',              # Which other nic do you wish to configure [done]
     'vagrant<Enter>',       # Pw for root account
     'vagrant<Enter>',
     'yes<Enter>',           # Start sshd by default ? [yes]
-    'no<Enter>',            # Start ntpd by default ? [yes]
     'no<Enter>',            # Do you want the X window system [yes]
     'vagrant<Enter>',       # Setup a user ?
     'vagrant<Enter>',       # Full username
     'vagrant<Enter>',       # Pw for this user
     'vagrant<Enter>',
-    'no<Enter>',            # Do you want to disable sshd for root ? [yes]
+    'yes<Enter>',           # Do you want to allow sshd for root ? [no]
     'GB<Enter>',            # What timezone are you in ?
     '<Enter>',              # Available disks [sd0]
-    '<Enter>',              # Use DUIDs rather than device names in fstab ? [yes]
     'W<Enter>',             # Use (W)whole disk or (E)edit MBR ? [whole]
     'A<Enter>',             # Use (A)auto layout ... ? [a]
-    '<Wait>' * 70,
-    'cd<Enter>',            # location of the sets [cd]
-    '<Enter>',              # Available cd-roms : cd0
-    '<Enter>',              # Pathname to sets ? [5.5/amd64]
-    '-game55.tgz<Enter>',   # Remove games and X
-    '-xbase55.tgz<Enter>',
-    '-xetc55.tgz<Enter>',
-    '-xshare55.tgz<Enter>',
-    '-xfont55.tgz<Enter>',
-    '-xserv55.tgz<Enter>',
+    '<Wait>' * 5,
+    '<Enter>',              # location of the sets [cd0]
+    '<Enter>',              # Pathname to sets ? [5.9/amd64]
+    '-game59.tgz<Enter>',   # Remove games and X
+    '-xbase59.tgz<Enter>',
+    '-xshare59.tgz<Enter>',
+    '-xfont59.tgz<Enter>',
+    '-xserv59.tgz<Enter>',
     'done<Enter>',
     '<Wait>',
-    'yes<Enter>',           # CD does not contain SHA256.sig (5.5) Continue without verification?
-    'done<Enter>',          # Done installing ?
-    '<Wait>' * 6,
+    'yes<Enter>',           # CD does not contain SHA256.sig (5.9) Continue without verification?
+    '<Wait>' * 60,
+    'done<Enter>',          # Location of sets?
     'yes<Enter><Wait>',     # Time appears wrong. Set to ...? [yes]
     '<Wait>' * 6,
     'reboot<Enter>',

data/boxes/definitions/openbsd-i386/definition.rb

@@ -5,50 +5,46 @@ Veewee::Session.declare({
   :disk_format => 'VDI',
   :hostiocache => 'off',
   :os_type_id => 'OpenBSD',
-  :iso_file => 'OpenBSD-5.5-i386.iso',
-  :iso_src => 'https://www.mirrorservice.org/pub/OpenBSD/5.5/i386/install55.iso',
-  :iso_sha256 => '43798eb4f459b58062167c24337230e96c78b01887a4be40d89279df379f3565',
+  :iso_file => 'OpenBSD-5.9-i386.iso',
+  :iso_src => 'https://www.mirrorservice.org/pub/OpenBSD/5.9/i386/install59.iso',
+  :iso_sha256 => 'd5579f49e1100c3131c674260959ee024b80ad579ea8fff767500652c9691030',
   :iso_download_timeout => '1000',
   :boot_wait => '50',
   :boot_cmd_sequence => [
     'I<Enter>',             # I - install
     'us<Enter>',            # set the keyboard
-    'OpenBSD55-x32<Enter>', # set the hostname
+    'OpenBSD59-x32<Enter>', # set the hostname
     '<Enter>',              # Which nic to config ? [em0]
     '<Enter>',              # do you want dhcp ? [dhcp]
     '<Wait>' * 5,
-    'none<Enter>',          # IPV6 for em0 ? [none]
-    'done<Enter>',          # Which other nic do you wish to configure [done]
+    '<Enter>',              # IPV6 for em0 ? [none]
+    '<Enter>',              # Which other nic do you wish to configure [done]
     'vagrant<Enter>',       # Pw for root account
     'vagrant<Enter>',
     'yes<Enter>',           # Start sshd by default ? [yes]
-    'no<Enter>',            # Start ntpd by default ? [yes]
     'no<Enter>',            # Do you want the X window system [yes]
     'vagrant<Enter>',       # Setup a user ?
     'vagrant<Enter>',       # Full username
     'vagrant<Enter>',       # Pw for this user
     'vagrant<Enter>',
-    'no<Enter>',            # Do you want to disable sshd for root ? [yes]
+    'yes<Enter>',           # Do you want to allow sshd for root ? [no]
     'GB<Enter>',            # What timezone are you in ?
     '<Enter>',              # Available disks [sd0]
-    '<Enter>',              # Use DUIDs rather than device names in fstab ? [yes]
     'W<Enter>',             # Use (W)whole disk or (E)edit MBR ? [whole]
     'A<Enter>',             # Use (A)auto layout ... ? [a]
-    '<Wait>' * 70,
-    'cd<Enter>',            # location of the sets [cd]
-    '<Enter>',              # Available cd-roms : cd0
-    '<Enter>',              # Pathname to sets ? [5.5/i386]
-    '-game55.tgz<Enter>',   # Remove games and X
-    '-xbase55.tgz<Enter>',
-    '-xetc55.tgz<Enter>',
-    '-xshare55.tgz<Enter>',
-    '-xfont55.tgz<Enter>',
-    '-xserv55.tgz<Enter>',
+    '<Wait>' * 5,
+    '<Enter>',              # location of the sets [cd0]
+    '<Enter>',              # Pathname to sets ? [5.9/i386]
+    '-game59.tgz<Enter>',   # Remove games and X
+    '-xbase59.tgz<Enter>',
+    '-xshare59.tgz<Enter>',
+    '-xfont59.tgz<Enter>',
+    '-xserv59.tgz<Enter>',
     'done<Enter>',
     '<Wait>',
-    'yes<Enter>',           # CD does not contain SHA256.sig (5.5) Continue without verification?
-    'done<Enter>',          # Done installing ?
-    '<Wait>' * 6,
+    'yes<Enter>',           # CD does not contain SHA256.sig (5.9) Continue without verification?
+    '<Wait>' * 60,
+    'done<Enter>',          # Location of sets?
     'yes<Enter><Wait>',     # Time appears wrong. Set to ...? [yes]
     '<Wait>' * 6,
     'reboot<Enter>',

data/boxes/definitions/openbsd-postinstall.sh

@@ -7,8 +7,8 @@ export PKG_PATH=http://ftp3.usa.openbsd.org/pub/OpenBSD/`uname -r`/packages/`arc
 echo "export PKG_PATH=$PKG_PATH" >> /root/.profile
 echo "export PKG_PATH=$PKG_PATH" >> /home/vagrant/.profile
 
-# install bash and wget
-pkg_add bash wget
+# install bash, wget and sudo
+pkg_add -z bash wget sudo--
 
 # set vagrant shell to bash
 usermod -s /usr/local/bin/bash vagrant

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.5.1.20190105'
+  s.version     = '0.5.2'
   s.summary     = %q{Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegtran, optipng, pngcrush, pngquant}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/script/run

@@ -24,34 +24,51 @@ header() {
   printf '\033[1;7m######## %s ########\033[0m\n' "$1"
 }
 
-if [[ `uname -s` != 'Darwin' ]]; then
+if [[ $(uname -s) != 'Darwin' ]]; then
   echo 'expected to run on Mac OS X'
   exit 1
 fi
 
 for arch in i386 x86_64; do
-  passes-filter "darwin-$arch" || continue
-  header "darwin-$arch"
+  platform="darwin-$arch"
+  passes-filter "$platform" || continue
+  header "$platform"
 
-  make $MAKE_TASK ARCH=$arch
+  build_dir=~_image_optim/pack
+
+  mkdir -p "vendor/$platform"
+
+  sudo -u _image_optim bash -c "
+    set -e
+
+    mkdir -p '$build_dir'
+    cd '$build_dir'
+
+    ln -nsf '$PWD/Makefile' '$PWD/checksums.mk' '$PWD/download' .
+    rsync -aR --del '$PWD/./vendor/$platform' .
+
+    make $MAKE_TASK ARCH=$arch
+  "
+
+  rsync -aR --del "$build_dir/./vendor/$platform" .
 done
 
 for vm in $(perl -pe "s/.*?'(.+?-.+?)'\s+=>\s+'.+?\/.+?'.*|.*/\$1/" Vagrantfile); do
   passes-filter "$vm" || continue
   header "$vm"
 
-  [[ -n "$NO_UP" ]] || vagrant up $vm
+  [[ -n "$NO_UP" ]] || vagrant up "$vm"
 
   # create ssh config
-  ssh_config=.vagrant/ssh_config.$vm
-  vagrant ssh-config $vm > $ssh_config
+  ssh_config=".vagrant/ssh_config.$vm"
+  vagrant ssh-config "$vm" > "$ssh_config"
 
   # rsync needed files to the box
-  mkdir -p vendor/$vm
-  rsync -e "ssh -F $ssh_config" -aR --del Makefile checksums.mk download vendor/$vm $vm:/vagrant
+  mkdir -p "vendor/$vm"
+  rsync -e "ssh -F $ssh_config" -aR --del Makefile checksums.mk download "vendor/$vm" "$vm:/vagrant"
 
   # sync time and run make
-  ssh -F $ssh_config $vm "
+  ssh -F "$ssh_config" "$vm" "
     set -e
 
     sudo ntpdate pool.ntp.org
@@ -65,7 +82,7 @@ for vm in $(perl -pe "s/.*?'(.+?-.+?)'\s+=>\s+'.+?\/.+?'.*|.*/\$1/" Vagrantfile)
   "
 
   # rsync files in vendor from the box
-  rsync -e "ssh -F $ssh_config" -aR --del $vm:/vagrant/./vendor/$vm .
+  rsync -e "ssh -F $ssh_config" -aR --del "$vm:/vagrant/./vendor/$vm" .
 
-  [[ -n "$NO_HALT" ]] || vagrant halt $vm
+  [[ -n "$NO_HALT" ]] || vagrant halt "$vm"
 done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.5.1.20190105
+  version: 0.5.2
 platform: x86-openbsd
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -163,7 +163,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_optim_pack/issues
   changelog_uri: https://github.com/toy/image_optim_pack/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.5.1.20190105
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.5.2
   source_code_uri: https://github.com/toy/image_optim_pack
 post_install_message: 
 rdoc_options: []
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,