image_optim_pack 0.3.1.20170318 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32968ec24a3ce7def81244407c709254506566b2
-  data.tar.gz: 649e4802bc63d2da764f86aab95e9f1b114b4193
+  metadata.gz: cb494271691e9abefb3561c371edc69c189f4a06
+  data.tar.gz: e991e94942704825edf3381d25cb7de853400715
 SHA512:
-  metadata.gz: 12b67a15393cb29989b9cdfb67274ea605ee09ed03b9957fad85f98ede910ae4d2af4be7acad256c39c3253c2e95d19b0fba76d2cd38f6af2225c5a2f60d5a5a
-  data.tar.gz: a47414a41edda453daca16dccec5086950975e3c5051a58ccfd4e2e7d82f8d405143661f102ae9b27dcb6b7f3c5d9c83157b8cd4e9019e4bb5e6caf68a29ddb8
+  metadata.gz: 5fa4b7f4e40550e9042749a74788e175503bf7e7b35bfdf0094bccbb2362272a420b70afdcdfd1b9b6be0369ab58a6e40a71ade755160e0c131b9b506da71262
+  data.tar.gz: efd70a78618bdd521ad722e17288225b520cd761142a3c8b04003f4f6989cc68296da060fdb5631fd8e64798aa52cf75f3ce32fbab4a3c91a96213237fe76875

data/.rubocop.yml

@@ -1,6 +1,8 @@
 AllCops:
   Exclude:
     - '*.gemspec'
+    - 'build/**/*'
+    - 'download/**/*'
     - Vagrantfile
 
 Bundler/OrderedGems:
@@ -67,6 +69,9 @@ Style/SpaceInsideHashLiteralBraces:
 Style/SpecialGlobalVars:
   Enabled: false
 
+Style/SymbolArray:
+  Enabled: false
+
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: no_comma
 

data/.travis.yml

@@ -5,9 +5,9 @@ rvm:
   - '1.9.3-p551'
   - '2.0.0-p648'
   - '2.1.10'
-  - '2.2.6'
-  - '2.3.3'
-  - '2.4.0'
+  - '2.2.7'
+  - '2.3.4'
+  - '2.4.1'
   - 'jruby-1.7.26'
   - 'jruby-9.0.5.0'
   - 'jruby-9.1.5.0'
@@ -19,11 +19,17 @@ before_install:
   if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install imagemagick; fi
 matrix:
   include:
+    - dist: trusty
+      rvm: default
+    - os: osx
+      rvm: default
+      osx_image: xcode7.3
     - os: osx
       rvm: default
+      osx_image: xcode8.3
     - env: RUBOCOP=✓
-      rvm: '2.4.0'
+      rvm: '2.4.1'
       script: bundle exec rubocop
     - env: CHECK_RUBIES=✓
-      rvm: '2.4.0'
+      rvm: '2.4.1'
       script: bundle exec travis_check_rubies

data/Makefile

@@ -13,7 +13,7 @@ LIBPNG_VER := 1.6.29
 LIBZ_VER := 1.2.11
 OPTIPNG_VER := 0.7.6
 PNGCRUSH_VER := 1.8.11
-PNGQUANT_VER := 2.9.0
+PNGQUANT_VER := 2.9.1
 
 # ====== CONSTANTS ======
 
@@ -110,13 +110,15 @@ PRODUCTS :=
 
 # $1 - product name
 # $2 - archive name ($1 if empty)
-# $3 - basename ($1 if empty)
+# $3 - path ($1 if empty)
 define target-build
-$1_BASENAME := $(or $3,$(call downcase,$1))
+$1_PATH := $(or $3,$(call downcase,$1))
+$1_BASENAME := $$(notdir $$($1_PATH))
 $1_DIR := $($(or $2,$1)_DIR)
 $1_TGZ := $($(or $2,$1)_TGZ)
 $1_EXTRACTED := $($(or $2,$1)_EXTRACTED)
-$1_TARGET := $$($1_DIR)/$$($1_BASENAME)
+$1_TARGET := $$($1_DIR)/$$($1_PATH)
+$$($1_TARGET) : DIR := $$($1_DIR)
 $$($1_TARGET) : $$($1_EXTRACTED)
 endef
 
@@ -129,7 +131,7 @@ PRODUCTS += $1
 $1_DESTINATION := $$(OUTPUT_DIR)/$$($1_BASENAME)
 # copy product to output dir
 $$($1_DESTINATION) : $$($1_TARGET)
-	temppath=`mktemp tmp.XXXXXXXXXX` && \
+	temppath=`mktemp "$(BUILD_DIR)"/tmp.XXXXXXXXXX` && \
 		strip $$< -Sx -o "$$$$temppath" && \
 		chmod 755 "$$$$temppath" && \
 		mv "$$$$temppath" $$@
@@ -138,16 +140,16 @@ $(call downcase,$1) : | $$($1_DESTINATION)
 endef
 
 $(eval $(call target,ADVPNG,ADVANCECOMP))
-$(eval $(call target,GIFSICLE))
+$(eval $(call target,GIFSICLE,,src/gifsicle))
 $(eval $(call target,JHEAD))
 $(eval $(call target,JPEG-RECOMPRESS,JPEGARCHIVE))
 $(eval $(call target,JPEGOPTIM))
-$(eval $(call target,JPEGTRAN,LIBJPEG))
+$(eval $(call target,JPEGTRAN,LIBJPEG,.libs/jpegtran))
 $(eval $(call target,LIBJPEG,,libjpeg$(DLEXT)))
 $(eval $(call target-build,LIBMOZJPEG,,libjpeg.a))
 $(eval $(call target,LIBPNG,,libpng$(DLEXT)))
 $(eval $(call target,LIBZ,,libz$(DLEXT)))
-$(eval $(call target,OPTIPNG))
+$(eval $(call target,OPTIPNG,,src/optipng/optipng))
 $(eval $(call target,PNGCRUSH))
 $(eval $(call target,PNGQUANT))
 
@@ -217,7 +219,7 @@ clobber : clean-all
 	rm -rf $(DL_DIR)
 .PHONY : clobber
 
-# ====== BUILDING ======
+# ====== BUILD HELPERS ======
 
 # $1 - name of product
 # $2 - list of dependency products
@@ -241,7 +243,7 @@ endef
 
 pkgconfig_pwd = perl -pi -e 's/(?<=dir=).*/$$ENV{PWD}/'
 
-libtool_target_soname = cd $(@D) && perl -pi -e 's/(?<=soname_spec=)".*"/"$(@F)"/ ; s/(?<=library_names_spec=)".*"/"\\\$$libname\\\$$shared_ext"/' -- libtool
+libtool_target_soname = perl -pi -e 's/(?<=soname_spec=)".*"/"$(@F)"/ ; s/(?<=library_names_spec=)".*"/"\\\$$libname\\\$$shared_ext"/' -- libtool
 
 ifdef IS_DARWIN
 chrpath_origin =
@@ -259,22 +261,20 @@ else
 XORIGIN :=
 endif
 
-export CC = gcc
-export CXX = g++
+# ====== ENV ======
+
+export CC := gcc
+export CXX := g++
 
 GCC_FLAGS := -O3
-ifdef IS_DARWIN
-GCC_FLAGS += -arch $(ARCH)
-else
-GCC_FLAGS += -s
-endif
-export CFLAGS := $(GCC_FLAGS)
-export CXXFLAGS := $(GCC_FLAGS)
-export CPPFLAGS := $(GCC_FLAGS)
-export LDFLAGS := $(GCC_FLAGS)
+export CFLAGS = $(GCC_FLAGS)
+export CXXFLAGS = $(GCC_FLAGS)
+export CPPFLAGS = $(GCC_FLAGS)
+export LDFLAGS = $(GCC_FLAGS)
 
 ifdef IS_DARWIN
-export MACOSX_DEPLOYMENT_TARGET=10.6
+export MACOSX_DEPLOYMENT_TARGET := 10.6
+GCC_FLAGS += -arch $(ARCH)
 endif
 
 ifdef IS_BSD
@@ -283,75 +283,75 @@ export AUTOCONF_VERSION := $(call autotool_version,autoconf)
 export AUTOMAKE_VERSION := $(call autotool_version,automake)
 endif
 
+# ====== BUILD TARGETS ======
+
 ## advpng
 $(eval $(call depend,ADVPNG,LIBZ))
 $(ADVPNG_TARGET) :
-	cd $(@D) && ./configure LDFLAGS="$(XORIGIN)"
-	cd $(@D) && $(MAKE) advpng
+	cd $(DIR) && ./configure LDFLAGS="$(XORIGIN)"
+	cd $(DIR) && $(MAKE) advpng
 	$(call chrpath_origin,$@)
 
 ## gifsicle
 $(GIFSICLE_TARGET) :
-	cd $(@D) && ./configure
-	cd $(@D) && $(MAKE) gifsicle
-	cd $(@D) && $(ln_s) src/gifsicle .
+	cd $(DIR) && ./configure
+	cd $(DIR) && $(MAKE) gifsicle
 
 ## jhead
 $(JHEAD_TARGET) :
-	cd $(@D) && $(MAKE) jhead CC="$(CC) $(GCC_FLAGS)"
+	cd $(DIR) && $(MAKE) jhead CC="$(CC) $(CFLAGS)"
 
 ## jpeg-recompress
 $(eval $(call depend-build,JPEG-RECOMPRESS,LIBMOZJPEG))
 $(JPEG-RECOMPRESS_TARGET) :
-	cd $(@D) && $(MAKE) jpeg-recompress CC="$(CC) $(GCC_FLAGS)" LIBJPEG=$(LIBMOZJPEG_TARGET) \
+	cd $(DIR) && $(MAKE) jpeg-recompress CC="$(CC) $(CFLAGS)" LIBJPEG=$(LIBMOZJPEG_TARGET) \
 		MAKE=$(MAKE) # fix for bsd in jpeg-archive-2.1.1
 
 ## jpegoptim
 $(eval $(call depend,JPEGOPTIM,LIBJPEG))
 $(JPEGOPTIM_TARGET) :
-	cd $(@D) && ./configure LDFLAGS="$(XORIGIN)" --host $(HOST)
-	cd $(@D) && $(MAKE) jpegoptim
+	cd $(DIR) && ./configure LDFLAGS="$(XORIGIN)" --host $(HOST)
+	cd $(DIR) && $(MAKE) jpegoptim
 	$(call chrpath_origin,$@)
 
 ## jpegtran
 $(eval $(call depend,JPEGTRAN,LIBJPEG))
 $(JPEGTRAN_TARGET) :
-	cd $(@D) && $(MAKE) jpegtran LDFLAGS="$(XORIGIN)"
-	cd $(@D) && $(ln_s) .libs/jpegtran .
+	cd $(DIR) && $(MAKE) jpegtran LDFLAGS="$(XORIGIN)"
 	$(call chrpath_origin,$(JPEGTRAN_TARGET))
 
 ## libjpeg
 $(LIBJPEG_TARGET) :
-	cd $(@D) && ./configure CC="$(CC) $(GCC_FLAGS)"
-	$(libtool_target_soname)
+	cd $(DIR) && ./configure CC="$(CC) $(CFLAGS)"
+	cd $(DIR) && $(libtool_target_soname)
 ifdef IS_DARWIN
-	cd $(@D) && $(MAKE) libjpeg.la LDFLAGS="-Wl,-install_name,@loader_path/$(@F)"
+	cd $(DIR) && $(MAKE) libjpeg.la LDFLAGS="-Wl,-install_name,@loader_path/$(@F)"
 else
-	cd $(@D) && $(MAKE) libjpeg.la
+	cd $(DIR) && $(MAKE) libjpeg.la
 endif
 	cd $(@D) && $(ln_s) .libs/libjpeg$(DLEXT) .
 
 ## libmozjpeg
 $(LIBMOZJPEG_TARGET) :
-	cd $(@D) && autoreconf -fiv
-	cd $(@D) && ./configure --host $(HOST)
-	cd $(@D)/simd && $(MAKE)
-	cd $(@D) && $(MAKE) libjpeg.la
-	cd $(@D) && $(ln_s) .libs/libjpeg.a .
+	cd $(DIR) && autoreconf -fiv
+	cd $(DIR) && ./configure --host $(HOST)
+	cd $(DIR)/simd && $(MAKE)
+	cd $(DIR) && $(MAKE) libjpeg.la
+	cd $(DIR) && $(ln_s) .libs/libjpeg.a .
 
 ## libpng
 $(eval $(call depend,LIBPNG,LIBZ))
 $(LIBPNG_TARGET) :
-	cd $(@D) && ./configure CC="$(CC) $(GCC_FLAGS)"
-	cd $(@D) && $(pkgconfig_pwd) -- *.pc
-	cd $(@D) && perl -pi -e 's/(?<=lpng)\d+//g' -- *.pc # %MAJOR%%MINOR% suffix
-	$(libtool_target_soname)
+	cd $(DIR) && ./configure CC="$(CC) $(CFLAGS)"
+	cd $(DIR) && $(pkgconfig_pwd) -- *.pc
+	cd $(DIR) && perl -pi -e 's/(?<=lpng)\d+//g' -- *.pc # %MAJOR%%MINOR% suffix
+	cd $(DIR) && $(libtool_target_soname)
 ifdef IS_DARWIN
-	cd $(@D) && $(MAKE) libpng16.la LDFLAGS="-Wl,-install_name,@loader_path/$(@F)"
+	cd $(DIR) && $(MAKE) libpng16.la LDFLAGS="-Wl,-install_name,@loader_path/$(@F)"
 else
-	cd $(@D) && $(MAKE) libpng16.la LDFLAGS="$(XORIGIN)"
+	cd $(DIR) && $(MAKE) libpng16.la LDFLAGS="$(XORIGIN)"
 endif
-	cd $(@D) && $(ln_s) .libs/libpng16$(DLEXT) libpng$(DLEXT)
+	cd $(DIR) && $(ln_s) .libs/libpng16$(DLEXT) libpng$(DLEXT)
 	$(call chrpath_origin,$@)
 
 ## libz
@@ -361,31 +361,33 @@ else
 $(LIBZ_TARGET) : export LDSHARED = $(CC) -shared -Wl,-soname,$(@F),--version-script,zlib.map
 endif
 $(LIBZ_TARGET) :
-	cd $(@D) && ./configure
-	cd $(@D) && $(pkgconfig_pwd) -- *.pc
-	cd $(@D) && $(MAKE) placebo
+	cd $(DIR) && ./configure
+	cd $(DIR) && $(pkgconfig_pwd) -- *.pc
+	cd $(DIR) && $(MAKE) placebo
 
 ## optipng
 $(eval $(call depend,OPTIPNG,LIBPNG LIBZ))
 $(OPTIPNG_TARGET) :
-	cd $(@D) && ./configure -with-system-libs
-	cd $(@D) && $(MAKE) all LDFLAGS="$(XORIGIN) $(GCC_FLAGS)"
-	cd $(@D) && $(ln_s) src/optipng/optipng .
+	cd $(DIR) && ./configure -with-system-libs
+	cd $(DIR) && $(MAKE) all LDFLAGS="$(XORIGIN) $(LDFLAGS)"
 	$(call chrpath_origin,$@)
 
 ## pngcrush
 $(eval $(call depend,PNGCRUSH,LIBPNG LIBZ))
 $(PNGCRUSH_TARGET) :
-	cd $(@D) && rm -f png.h pngconf.h
-	cd $(@D) && $(MAKE) -f Makefile pngcrush \
+	cd $(DIR) && rm -f png.h pngconf.h
+	cd $(DIR) && $(MAKE) pngcrush \
+		CC="$(CC)" \
+		LD="$(CC)" \
 		LIBS="-lpng -lz -lm" \
-		CFLAGS="$(GCC_FLAGS)" \
-		LDFLAGS="$(XORIGIN) $(GCC_FLAGS)"
+		CFLAGS="$(CFLAGS)" \
+		CPPFLAGS="$(CPPFLAGS)" \
+		LDFLAGS="$(XORIGIN) $(LDFLAGS)"
 	$(call chrpath_origin,$@)
 
 ## pngquant
 $(eval $(call depend,PNGQUANT,LIBPNG LIBZ))
 $(PNGQUANT_TARGET) :
-	cd $(@D) && ./configure --without-cocoa --extra-ldflags="$(XORIGIN)"
-	cd $(@D) && $(MAKE) pngquant
+	cd $(DIR) && ./configure --without-cocoa --extra-ldflags="$(XORIGIN)"
+	cd $(DIR) && $(MAKE) pngquant
 	$(call chrpath_origin,$@)

data/README.markdown

@@ -67,6 +67,7 @@ Boxes for vagrant are built using [veewee](https://github.com/jedi4ever/veewee),
 ```sh
 script/run # Build and test all for all oses and architectures
 script/run NO_HALT=1 # Don't halt VMs after building
+script/run NO_UP=1 # Don't start VMs before building (will fail if not already running)
 script/run darwin 64 # Build only platforms matching darwin or 64
 
 make # Build all tools and copy them to vendor/OS-ARCH for current OS and ARCH, then test

data/Vagrantfile

@@ -10,14 +10,15 @@ Vagrant.configure('2') do |config|
   # there are no guest additions
   config.vm.provider 'virtualbox' do |vb|
     vb.check_guest_additions = false
+    vb.customize ['modifyvm', :id, '--groups', '/image_optim']
   end
 
   # handle manually using rsync
   config.vm.synced_folder '.', '/vagrant', disabled: true
 
   {
-    'linux-x86_64'  => 'boxes/centos-amd64.box',
-    'linux-i686'    => 'boxes/centos-i386.box',
+    'linux-x86_64'  => 'ubuntu/trusty64',
+    'linux-i686'    => 'ubuntu/trusty32',
     'freebsd-amd64' => 'boxes/freebsd-amd64.box',
     'freebsd-i386'  => 'boxes/freebsd-i386.box',
     'openbsd-amd64' => 'boxes/openbsd-amd64.box',
@@ -31,17 +32,17 @@ Vagrant.configure('2') do |config|
       when /^linux/
         <<-SH
           set -ex
-          yum -y install rsync ntpdate make wget gcc gcc-c++ chrpath perl pkg-config autoconf automake libtool nasm
+          apt-get -y install rsync ntpdate make wget gcc g++ 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
+          pkg install -y rsync 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
+          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

data/boxes/.rubocop.yml

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

data/boxes/Gemfile

@@ -1,6 +1,11 @@
 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

@@ -35,9 +35,10 @@ class Box # :nodoc:
   end
 
   def dependencies
-    [definition_path] + Array(definition[:postinstall_files]).map do |path|
+    postinstall_file_paths = Array(definition[:postinstall_files]).map do |path|
       definition_dir + path
     end
+    [definition_path] + postinstall_file_paths
   end
 
   def build

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

@@ -5,9 +5,9 @@ Veewee::Session.declare({
   :disk_format => 'VDI',
   :hostiocache => 'off',
   :os_type_id => 'FreeBSD_64',
-  :iso_file => 'FreeBSD-9.3-RELEASE-amd64-disc1.iso',
-  :iso_src => 'http://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso',
-  :iso_sha256 => '5a3c82653d77bba7d7ded8bd7efbedc09d52cf4045d98ce52a82c9e0f8fa9b0e',
+  :iso_file => 'FreeBSD-10.3-RELEASE-amd64-disc1.iso',
+  :iso_src => 'http://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/10.3/FreeBSD-10.3-RELEASE-amd64-disc1.iso',
+  :iso_sha256 => 'fef068cf6dea26923ab84b62ba9f21461ca0bdec90a0741c8ffb0e1ca29e410d',
   :iso_download_timeout => '1000',
   :boot_wait => '10',
   :boot_cmd_sequence => [

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

@@ -5,9 +5,9 @@ Veewee::Session.declare({
   :disk_format => 'VDI',
   :hostiocache => 'off',
   :os_type_id => 'FreeBSD',
-  :iso_file => 'FreeBSD-9.3-RELEASE-i386-disc1.iso',
-  :iso_src => 'http://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso',
-  :iso_sha256 => 'cab6aad9c3d5ea6a3fb4059f808225c67f1edaea730c555a86a9707ac41ba75d',
+  :iso_file => 'FreeBSD-10.3-RELEASE-i386-disc1.iso',
+  :iso_src => 'http://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/10.3/FreeBSD-10.3-RELEASE-i386-disc1.iso',
+  :iso_sha256 => '8329ee2ca4779892edbb001c303670d74642e4353e97d02f4521895023cacd5d',
   :iso_download_timeout => '1000',
   :boot_wait => '10',
   :boot_cmd_sequence => [

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

@@ -6,7 +6,7 @@ Veewee::Session.declare({
   :hostiocache => 'off',
   :os_type_id => 'OpenBSD_64',
   :iso_file => 'OpenBSD-5.5-amd64.iso',
-  :iso_src => 'http://ftp3.usa.openbsd.org/pub/OpenBSD/5.5/amd64/install55.iso',
+  :iso_src => 'https://www.mirrorservice.org/pub/OpenBSD/5.5/amd64/install55.iso',
   :iso_sha256 => 'cc465ce3f8397883e91c6e1a8a98b1b3507a338984bbfe8978050c5f8fdcaf3f',
   :iso_download_timeout => '1000',
   :boot_wait => '50',

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

@@ -6,7 +6,7 @@ Veewee::Session.declare({
   :hostiocache => 'off',
   :os_type_id => 'OpenBSD',
   :iso_file => 'OpenBSD-5.5-i386.iso',
-  :iso_src => 'http://ftp3.usa.openbsd.org/pub/OpenBSD/5.5/i386/install55.iso',
+  :iso_src => 'https://www.mirrorservice.org/pub/OpenBSD/5.5/i386/install55.iso',
   :iso_sha256 => '43798eb4f459b58062167c24337230e96c78b01887a4be40d89279df379f3565',
   :iso_download_timeout => '1000',
   :boot_wait => '50',

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.3.1.20170318'
+  s.version     = '0.4.0'
   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

@@ -36,11 +36,11 @@ for arch in i386 x86_64; do
   make $MAKE_TASK ARCH=$arch
 done
 
-for vm in $(perl -pe "s/.*?'(.+?-.+?)'.*|.*/\$1/" Vagrantfile | sort -u); do
+for vm in $(perl -pe "s/.*?'(.+?-.+?)'\s+=>\s+'.+?\/.+?'.*|.*/\$1/" Vagrantfile | sort -u); do
   passes-filter "$vm" || continue
   header "$vm"
 
-  vagrant up $vm
+  [[ -n "$NO_UP" ]] || vagrant up $vm
 
   # create ssh config
   ssh_config=.vagrant/ssh_config.$vm

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.3.1.20170318
+  version: 0.4.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -113,11 +113,6 @@ files:
 - boxes/.rubocop.yml
 - boxes/Gemfile
 - boxes/Rakefile
-- boxes/definitions/centos-amd64/definition.rb
-- boxes/definitions/centos-amd64/ks.cfg
-- boxes/definitions/centos-i386/definition.rb
-- boxes/definitions/centos-i386/ks.cfg
-- boxes/definitions/centos-postinstall.sh
 - boxes/definitions/freebsd-amd64/definition.rb
 - boxes/definitions/freebsd-amd64/install.sh
 - boxes/definitions/freebsd-i386/definition.rb
@@ -251,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: image_optim_pack
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,

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

@@ -1,30 +0,0 @@
-Veewee::Session.declare({
-  :cpu_count => '1',
-  :memory_size => '512',
-  :disk_size => '8192',
-  :disk_format => 'VDI',
-  :hostiocache => 'off',
-  :os_type_id => 'RedHat6_64',
-  :iso_file => 'CentOS-6.5-x86_64-minimal.iso',
-  :iso_src => 'http://yum.singlehop.com/CentOS/6.5/isos/x86_64/CentOS-6.5-x86_64-minimal.iso',
-  :iso_sha256 => 'f9d84907d77df62017944cb23cab66305e94ee6ae6c1126415b81cc5e999bdd0',
-  :iso_download_timeout => '1000',
-  :boot_wait => '10',
-  :boot_cmd_sequence => [
-    '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>',
-  ],
-  :kickstart_port => '7122',
-  :kickstart_timeout => '300',
-  :kickstart_file => 'ks.cfg',
-  :ssh_login_timeout => '10000',
-  :ssh_user => 'veewee',
-  :ssh_password => 'veewee',
-  :ssh_key => '',
-  :ssh_host_port => '7222',
-  :ssh_guest_port => '22',
-  :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
-  :shutdown_cmd => '/sbin/halt -h -p',
-  :postinstall_files => %w[../centos-postinstall.sh],
-  :postinstall_timeout => '10000',
-  :skip_iso_transfer => true,
-})

data/boxes/definitions/centos-amd64/ks.cfg

@@ -1,37 +0,0 @@
-install
-cdrom
-lang en_US.UTF-8
-keyboard us
-network --bootproto=dhcp
-rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
-firewall --enabled --service=ssh
-authconfig --enableshadow --passalgo=sha512
-selinux --disabled
-timezone UTC
-bootloader --location=mbr
-
-text
-skipx
-zerombr
-
-clearpart --all --initlabel
-autopart
-
-auth  --useshadow  --enablemd5
-firstboot --disabled
-reboot
-
-%packages --nobase
-@core
-openssh-clients
-%end
-
-%post
-/usr/bin/yum -y install sudo
-/usr/sbin/groupadd veewee
-/usr/sbin/useradd veewee -g veewee -G wheel
-echo "veewee"|passwd --stdin veewee
-echo "veewee        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/veewee
-chmod 0440 /etc/sudoers.d/veewee
-%end
-

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

@@ -1,30 +0,0 @@
-Veewee::Session.declare({
-  :cpu_count => '1',
-  :memory_size => '512',
-  :disk_size => '8192',
-  :disk_format => 'VDI',
-  :hostiocache => 'off',
-  :os_type_id => 'RedHat',
-  :iso_file => 'CentOS-6.5-i386-minimal.iso',
-  :iso_src => 'http://yum.singlehop.com/CentOS/6.5/isos/i386/CentOS-6.5-i386-minimal.iso',
-  :iso_sha256 => '3e8fb326bf389c631dcea9c16da6ebcd2c6f150d526e147c1307beb9314eb794',
-  :iso_download_timeout => '1000',
-  :boot_wait => '10',
-  :boot_cmd_sequence => [
-    '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>',
-  ],
-  :kickstart_port => '7122',
-  :kickstart_timeout => '300',
-  :kickstart_file => 'ks.cfg',
-  :ssh_login_timeout => '10000',
-  :ssh_user => 'veewee',
-  :ssh_password => 'veewee',
-  :ssh_key => '',
-  :ssh_host_port => '7222',
-  :ssh_guest_port => '22',
-  :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
-  :shutdown_cmd => '/sbin/halt -h -p',
-  :postinstall_files => %w[../centos-postinstall.sh],
-  :postinstall_timeout => '10000',
-  :skip_iso_transfer => true,
-})

data/boxes/definitions/centos-i386/ks.cfg

@@ -1,37 +0,0 @@
-install
-cdrom
-lang en_US.UTF-8
-keyboard us
-network --bootproto=dhcp
-rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
-firewall --enabled --service=ssh
-authconfig --enableshadow --passalgo=sha512
-selinux --disabled
-timezone UTC
-bootloader --location=mbr
-
-text
-skipx
-zerombr
-
-clearpart --all --initlabel
-autopart
-
-auth  --useshadow  --enablemd5
-firstboot --disabled
-reboot
-
-%packages --nobase
-@core
-openssh-clients
-%end
-
-%post
-/usr/bin/yum -y install sudo
-/usr/sbin/groupadd veewee
-/usr/sbin/useradd veewee -g veewee -G wheel
-echo "veewee"|passwd --stdin veewee
-echo "veewee        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/veewee
-chmod 0440 /etc/sudoers.d/veewee
-%end
-

data/boxes/definitions/centos-postinstall.sh

@@ -1,33 +0,0 @@
-set -ex
-
-sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
-
-yum -y install wget
-
-# Make ssh faster by not waiting on DNS
-echo "UseDNS no" >> /etc/ssh/sshd_config
-
-# Vagrant specific
-date > /etc/vagrant_box_build_time
-
-# Add vagrant user
-/usr/sbin/groupadd vagrant
-/usr/sbin/useradd vagrant -g vagrant -G wheel
-echo "vagrant"|passwd --stdin vagrant
-echo "vagrant        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
-chmod 0440 /etc/sudoers.d/vagrant
-
-# Installing vagrant keys
-mkdir -pm 700 /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
-chmod 0600 /home/vagrant/.ssh/authorized_keys
-chown -R vagrant /home/vagrant/.ssh
-
-yum -y clean all
-
-# Remove traces of mac address from network configuration
-sed -i /HWADDR/d /etc/sysconfig/network-scripts/ifcfg-eth0
-rm /etc/udev/rules.d/70-persistent-net.rules
-
-# Zero out the free space to save space in the final image
-dd if=/dev/zero of=/filler bs=1M || rm /filler