image_optim_pack 0.2.3 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWUyNWZhNTE2NWJhZGFmN2M4YjdlZTY2ZjMwMDlhNmJmYjk4NmJlOA==
+    NDJlODk4ZjgyOGU3ODVmMTMxYzFhN2VmNDBiYzU5ZGFkMmJjMDg4Nw==
   data.tar.gz: !binary |-
-    MmU0Y2YzYTBhMzgyZGZmMmVkMDI2YTdmMzUwOTI0Zjc2NDJhMmNhMg==
+    Yjk1NzE3MzdkZDJhM2RhYTBkNTFlNjgzYzhhNjI5YzEzMDk0ODFlMQ==
 SHA512:
   metadata.gz: !binary |-
-    YTc1YzMyZTU4MWMyMDJlZjMxNTU0ZDg0NTlkZTRhOGY1M2I2NTViODJiYmEy
-    NGU5MGRmYmViY2ViZmJjYmQ3MmY2NWM0ZDQ5ZTJhODk0OTMxZDNkMjM0ZTBi
-    ZDQ1YmZlNTMyMTE0YjIyZGZhNWU1ODZiYmU1YzM1ZTEyNTBhNzI=
+    MjAxMTI2ZTY3MDEyMzFmZmQ4ODI4MGMyZTczN2Y5YWZiOTkyYzAxZmFmN2Y4
+    NzgyMjZjYzBhYTJjYTY5OTQ5Y2Y5MmQzNTIxZWYxNTNhMWQwNzIzYjA3MzEy
+    ZWM5OTk5NTczYTNmMjVhYzMzZDZiMWEyNTM3YWEwZGU1NGQxNWY=
   data.tar.gz: !binary |-
-    ZTE0NmUzMzRlNTE5Nzg1YWEyN2VkMDczMmJhNzQ5MDY4M2I2ZjM1M2E5Mjhk
-    ZmE2MjBkNDUyNmFjODk0OGM3MTc4ZTgyYWUwNTIzOTgwNDU0ZWI2OTUwMTEz
-    ODc0YzdmMWViOWZhMWFiODFiMTQwMmIyMTAxMjEyYTdiMzcxNzI=
+    NDQzODVkODljZTQ0YWRhNDMzYzE1ZDgyNTVmYTg2YzAxNmM5Yzc5MmJjZjA1
+    ZTI5YWM1ZjFjNTk1MjQ0NTNkMjg3M2I5MjE0MjNlYWU0YTUyYjZiNDdhMjJi
+    YTEzNzg3OTY3OGY2ODUyYjE5MWNhMWVlYzA5N2Q3MmY0MmZjNTk=

data/.gitignore

@@ -2,7 +2,7 @@
 /download/
 /.vagrant/
 
-/Gemfile.lock
+Gemfile.lock
 /*.gem
 /.bundle
 /tmp/

data/.rubocop.yml

@@ -12,6 +12,9 @@ Metrics/MethodLength:
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
 
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
 Style/CaseIndentation:
   IndentWhenRelativeTo: end
 

data/.travis.yml

@@ -9,14 +9,17 @@ rvm:
   - jruby-18mode
   - jruby-19mode
   - ree
-script:
-  if [ -z "$RUBOCOP" ]; then
-    make test
-    && bundle exec image_optim --info
-    && bundle exec rspec
-  ; else
-    bundle exec rubocop
-  ; fi
+script: |
+  (
+    set -ex
+    if [ -n "$RUBOCOP" ]; then
+      bundle exec rubocop
+    else
+      make test
+      bundle exec image_optim --info
+      bundle exec rspec
+    fi
+  )
 before_install:
   if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install imagemagick; fi
 matrix:
@@ -25,4 +28,4 @@ matrix:
     - os: osx
       rvm: default
     - env: RUBOCOP=true
-      rvm: default
+      rvm: '2'

data/Makefile

@@ -12,7 +12,7 @@ LIBMOZJPEG_VER := 3.1
 LIBPNG_VER := 1.6.23
 LIBZ_VER := 1.2.8
 OPTIPNG_VER := 0.7.6
-PNGCRUSH_VER := 1.8.1
+PNGCRUSH_VER := 1.8.2
 PNGQUANT_VER := 2.7.1
 
 # ====== CONSTANTS ======
@@ -21,14 +21,18 @@ OS := $(shell uname -s | tr A-Z a-z)
 ARCH := $(shell uname -m)
 
 IS_DARWIN := $(findstring darwin,$(OS))
+IS_LINUX := $(findstring linux,$(OS))
+IS_BSD := $(findstring bsd,$(OS))
+IS_FREEBSD := $(findstring freebsd,$(OS))
+IS_OPENBSD := $(findstring openbsd,$(OS))
 DLEXT := $(if $(IS_DARWIN),.dylib,.so)
 HOST := $(ARCH)-$(if $(IS_DARWIN),apple,pc)-$(OS)
 
 DL_DIR := $(CURDIR)/download
 BUILD_ROOT_DIR := $(CURDIR)/build
-BUILD_DIR := $(BUILD_ROOT_DIR)/$(OS)/$(ARCH)
+BUILD_DIR := $(BUILD_ROOT_DIR)/$(OS)-$(ARCH)
 OUTPUT_ROOT_DIR := $(CURDIR)/vendor
-OUTPUT_DIR := $(OUTPUT_ROOT_DIR)/$(OS)/$(ARCH)
+OUTPUT_DIR := $(OUTPUT_ROOT_DIR)/$(OS)-$(ARCH)
 
 # ====== HELPERS ======
 
@@ -36,6 +40,7 @@ downcase = $(shell echo $1 | tr A-Z a-z)
 
 mkpath := mkdir -p
 ln_s := ln -sf
+tar := $(shell if command -v gtar >/dev/null 2>&1; then echo gtar; else echo tar; fi)
 
 # lock using %.lock dir, download to %.tmp rename to %, remove %.lock
 define download
@@ -105,7 +110,10 @@ $(call target-build,$1,$2,$3)
 PRODUCTS += $1
 # copy product to output dir
 $$(OUTPUT_DIR)/$$($1_BASENAME) : $$($1_TARGET)
-	strip $$< -Sx -o $$@
+	temppath=`mktemp tmp.XXXXXXXXXX` && \
+		strip $$< -Sx -o "$$$$temppath" && \
+		chmod 755 "$$$$temppath" && \
+		mv "$$$$temppath" $$@
 # short name target
 $(call downcase,$1) : | $$(OUTPUT_DIR)/$$($1_BASENAME)
 endef
@@ -136,6 +144,7 @@ download-tidy-up :
 build : $(foreach product,$(PRODUCTS),$($(product)_TARGET))
 
 define check_bin
+	@printf "$1: "
 	@test -f $(OUTPUT_DIR)/$1 || (echo "no $1"; false)
 	@# if bin exists check architecture
 	@test ! -f $(OUTPUT_DIR)/$1 || \
@@ -143,15 +152,15 @@ define check_bin
 		(echo "Expected $(ARCH_STRING), got $$(file -b $(OUTPUT_DIR)/$1)"; false)
 	@# if bin exists check and output version
 	@test ! -f $(OUTPUT_DIR)/$1 || \
-		$(OUTPUT_DIR)/$1 $2 | fgrep --color $3 || \
+		$(OUTPUT_DIR)/$1 $2 | fgrep -o $3 || \
 		(echo "Expected $3, got $$($(OUTPUT_DIR)/$1 $2)"; false)
 endef
 
 ifdef IS_DARWIN
 test : ARCH_STRING := $(ARCH)
-else ifeq (i686,$(ARCH))
+else ifeq (i386,$(ARCH:i686=i386))
 test : ARCH_STRING := Intel 80386
-else ifeq (x86_64,$(ARCH))
+else ifeq (amd64,$(ARCH:x86_64=amd64))
 test : ARCH_STRING := x86-64
 endif
 test :
@@ -209,18 +218,29 @@ endef
 define clean_untar
 	rm -rf $(@D)
 	$(mkpath) $(@D)
-	tar -C $(@D) --strip-components=1 -m -xzf $<
+	$(tar) -C $(@D) --strip-components=1 -xzf $<
 	touch $(@D)/__$(notdir $<)__
 endef
 
 pkgconfig_pwd = perl -pi -e 's/(?<=dir=).*/$$ENV{PWD}/'
 
-libtool_target_soname = cd $(@D) && perl -pi -e 's/(?<=soname_spec=)".*"/"$(@F)"/' -- libtool
+libtool_target_soname = cd $(@D) && perl -pi -e 's/(?<=soname_spec=)".*"/"$(@F)"/ ; s/(?<=library_names_spec=)".*"/"\\\$$libname\\\$$shared_ext"/' -- libtool
 
-chrpath_origin = $(if $(IS_DARWIN),,chrpath -r '$$ORIGIN' $1)
+ifdef IS_DARWIN
+chrpath_origin =
+else ifdef IS_OPENBSD
+chrpath_origin = perl -pi -e 's/XORIGIN/\$$ORIGIN/' -- $1
+else
+chrpath_origin = chrpath -r '$$ORIGIN' $1
+endif
 
+ifdef IS_LINUX
 XORIGIN := -Wl,-rpath,XORIGIN
-XORIGIN := $(if $(IS_DARWIN),,$(XORIGIN))
+else ifdef IS_BSD
+XORIGIN := -Wl,-rpath,XORIGIN -Wl,-z,origin
+else
+XORIGIN :=
+endif
 
 export CC = gcc
 export CXX = g++
@@ -240,6 +260,12 @@ ifdef IS_DARWIN
 export MACOSX_DEPLOYMENT_TARGET=10.6
 endif
 
+ifdef IS_BSD
+autotool_version = $(shell printf '%s\n' /usr/local/bin/$1-* | egrep -o '[0-9][^-]+$$' | tail -n 1)
+export AUTOCONF_VERSION := $(call autotool_version,autoconf)
+export AUTOMAKE_VERSION := $(call autotool_version,automake)
+endif
+
 ## advpng
 $(eval $(call depend,ADVPNG,LIBZ))
 $(ADVPNG_TARGET) :; $(clean_untar)
@@ -260,7 +286,8 @@ $(JHEAD_TARGET) :; $(clean_untar)
 ## jpeg-recompress
 $(eval $(call depend-build,JPEG-RECOMPRESS,LIBMOZJPEG))
 $(JPEG-RECOMPRESS_TARGET) :; $(clean_untar)
-	cd $(@D) && $(MAKE) jpeg-recompress CC="$(CC) $(GCC_FLAGS)" LIBJPEG=$(LIBMOZJPEG_TARGET)
+	cd $(@D) && $(MAKE) jpeg-recompress CC="$(CC) $(GCC_FLAGS)" LIBJPEG=$(LIBMOZJPEG_TARGET) \
+		MAKE=$(MAKE) # fix for bsd in jpeg-archive-2.1.1
 
 ## jpegoptim
 $(eval $(call depend,JPEGOPTIM,LIBJPEG))

data/README.markdown

@@ -8,7 +8,7 @@
 
 Precompiled binaries for [`image_optim`](https://github.com/toy/image_optim).
 
-Contains binaries for Mac OS X (>= 10.6, i386 and x86\_64) and Linux (i686 and x86\_64).
+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).
 
 ## Binaries and libraries
 
@@ -37,6 +37,8 @@ Contains binaries for Mac OS X (>= 10.6, i386 and x86\_64) and Linux (i686 and x
 * [pngquant](http://pngquant.org/) by Kornel Lesiński based on code by Greg Roelofs and Jef Poskanzer after an idea by Stefan Schneider ([license](acknowledgements/pngquant.txt))
 * [zlib](http://zlib.net/) by Jean-Loup Gailly and Mark Adler ([license](acknowledgements/zlib.txt))
 
+**NOTE: On FreeBSD and OpenBSD `make` is not the GNU Make, so `gmake` should be used instead.**
+
 You can download all source code using gnu make download target:
 
 ```sh
@@ -58,27 +60,30 @@ gem 'image_optim_pack'
 
 ## Development
 
-Mac OS X binaries and libraries are built on host, others using vagrant.
+Mac OS X binaries and libraries are built on host, others using [vagrant](https://www.vagrantup.com/).
+
+Boxes for vagrant are built using [veewee](https://github.com/jedi4ever/veewee), check [boxes/Rakefile](boxes/Rakefile) and [boxes/definitions](boxes/definitions).
 
 ```sh
 script/run # Build and test all for all oses and architectures
 script/run NO_HALT=1 # Don't halt VMs after building
 
-make all # Build and copy all to output directory for current os/arch, then test
-make run # => all
+make # Build all tools and copy them to vendor/OS-ARCH for current OS and ARCH, then test
+make all # same
+make run # same
 
-make test # Test bins for current os/arch
-make test -i # Continue if one of bins fail
+make livecheck # Check versions
+make update-versions # Update versions in Makefile
 
 make download # Download archives
 make build # Build all without copying to output directory
 
-make livecheck # Check versions
-make update-versions # Update versions in Makefile
+make test # Test bins for current os/arch
+make test -i # Continue if one of bins fail
 
 make clean # Remove build and output directories for current os/arch
 make clean-all # Remove build root and output root directories
-make clobber # `claen-all` and remove download directory
+make clobber # `clean-all` and remove download directory
 ```
 
 ## Copyright

data/Vagrantfile

@@ -1,13 +1,51 @@
+Vagrant.require_version '!= 1.8.5' # OpenBSD can't be halted in 1.8.5
+
 Vagrant.configure('2') do |config|
+  # don't mess with keys
+  config.ssh.insert_key = false
+
+  # handle manually using rsync
+  config.vm.synced_folder '.', '/vagrant', disabled: true
+
   {
-    linux_i686: 'chef/centos-6.5-i386',
-    linux_x86_64: 'chef/centos-6.5',
-  }.each do |name, url|
+    'linux-x86_64'  => 'boxes/centos-amd64.box',
+    'linux-i686'    => 'boxes/centos-i386.box',
+    'freebsd-amd64' => 'boxes/freebsd-amd64.box',
+    'freebsd-i386'  => 'boxes/freebsd-i386.box',
+    'openbsd-amd64' => 'boxes/openbsd-amd64.box',
+    'openbsd-i386'  => 'boxes/openbsd-i386.box',
+  }.each do |name, location|
     config.vm.define name do |machine|
-      machine.vm.hostname = name.to_s.gsub('_', '-')
-      machine.vm.box = url
+      machine.vm.hostname = name.gsub('_', '-')
+      machine.vm.box = location
+
+      machine.vm.provision :shell, inline: case name
+      when /^linux/
+        <<-SH
+          set -ex
+          yum -y install rsync ntpdate make wget gcc gcc-c++ chrpath perl pkg-config autoconf automake libtool nasm
+        SH
+      when /^freebsd/
+        <<-SH
+          set -ex
+          pkg install -y rsync ntp gmake wget gcc chrpath perl5 pkgconf autoconf automake libtool nasm
+        SH
+      when /^openbsd/
+        <<-SH
+          set -ex
+          pkg_add -z rsync-- ntp gmake gtar-- wget gcc-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
+        SH
+      end
+
+      machine.vm.provision :shell, inline: <<-SH
+        set -ex
+        mkdir -p /vagrant
+        chown vagrant:vagrant /vagrant
+      SH
     end
   end
-
-  config.vm.provision :shell, path: 'script/vm_init'
 end

data/boxes/.gitignore

@@ -0,0 +1,3 @@
+/*.box
+/.env
+/iso/

data/boxes/.rubocop.yml

@@ -0,0 +1,10 @@
+inherit_from: ../.rubocop.yml
+
+Lint/Eval:
+  Exclude: [Rakefile]
+
+Metrics/LineLength:
+  Enabled: false
+
+Style/BracesAroundHashParameters:
+  Enabled: false

data/boxes/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'veewee', '= 0.4.5.1'
+gem 'dotenv', '~> 2.0'
+gem 'atlas', '~> 1.3'
+gem 'progress', '~> 3.1'

data/boxes/Rakefile

@@ -0,0 +1,143 @@
+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
+
+  def initialize(definition_path)
+    @definition_path = Pathname(definition_path)
+    @definition_dir = @definition_path.dirname
+    @name = @definition_dir.basename.to_s
+    @path = Pathname("#{@name}.box")
+  end
+
+  def dependencies
+    [definition_path] + Array(definition[:postinstall_files]).map do |path|
+      definition_dir + path
+    end
+  end
+
+  def build
+    sh(*%W[veewee vbox build --auto --checksum --force --nogui #{name}])
+    sh(*%w[sleep 30])
+    sh(*%W[veewee vbox export --force #{name}])
+    sh(*%W[veewee vbox destroy #{name}])
+  end
+
+  def add
+    assert_box_created
+
+    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
+    @definition ||= begin
+      eval definition_path.read.sub('Veewee::Session.declare', '{}.merge')
+    end
+  end
+
+  def assert_box_created
+    abort "#{path} doesn't exist" unless path.size?
+  end
+
+  def sh(*args)
+    abort unless system(*args)
+  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}"
+  file box.path => box.dependencies do
+    box.build
+  end
+  task :build => box.path
+
+  namespace :add do
+    desc "add #{box.path}"
+    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
+  end
+  task :upload => "upload:#{box.name}"
+end
+
+desc 'remove *.box and iso dir'
+task :clean do
+  sh 'rm *.box || true'
+  sh 'rm -r iso || true'
+end
+
+task :default => :build