image_optim_pack 0.3.0.20160905 → 0.3.0.20160927

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjE4NjY2NmU1MjY1ZDE3YjIyYTAwMmFkZTY2ZDRlY2U1MzBiNDU5ZA==
-  data.tar.gz: !binary |-
-    NTJhYzY3MGU4NDUzYjZlZWE0MTY5NGYxY2RiNzU2MTc4NWY1NTJmYw==
+SHA1:
+  metadata.gz: fdaa81aba3ea85d78162e6efb392bee1f6ec3bee
+  data.tar.gz: e924ac254159bed43d7fee6e195a1536b71145c2
 SHA512:
-  metadata.gz: !binary |-
-    ZWM2MzgzNjM2NDVjNmJkMGQ1NjBkMTBmMmE2MDUzZmJhZDU3YTg2NDNjMGY0
-    NWFhMzc3NzkyMmVjZDQ5MjI1ZGIzM2U1OTdjNjY5MTg0MmNiZmNiNWU5NGE5
-    NzNiMWY4YzNmZmZkYWJiNzAxNGI5ZWNhNjQ2NDgxYjkxMGYzYmU=
-  data.tar.gz: !binary |-
-    NDQ5ODQ1ODAyOGNhMzMyYzhhODI4OThmMzFjNDYyY2E2Y2M1NzAzNjRhYzdi
-    NzkzNGJkMDg2ZTc5ZTUzYzAyYWUzZWFiMWZjYjY5MjI1ZjA3ODdmNDIyYmU1
-    YWIxYTBlYWM0NjE1MmMwZjlkNmMyM2NmYTc0ODJlYTM5MDE1NWI=
+  metadata.gz: 4d65034b4c6d6a1e62ffbd9afc6b1f4a676ebcd5fb2932516f113977677a6c9c3ebda072b0ef59a6f03f3a35ef02334a0b36872efaf2b0979672a76d0a6c815f
+  data.tar.gz: d0632924fadc2a35ce81dea63cc2e108b1f4516769f7606fed6cd343b78416e195ecc8daa2ca1389e8a316b6fb42aa88596f809e52eafec862b17deac90b85e6

data/Makefile

@@ -12,7 +12,7 @@ LIBMOZJPEG_VER := 3.1
 LIBPNG_VER := 1.6.25
 LIBZ_VER := 1.2.8
 OPTIPNG_VER := 0.7.6
-PNGCRUSH_VER := 1.8.6
+PNGCRUSH_VER := 1.8.7
 PNGQUANT_VER := 2.7.1
 
 # ====== CONSTANTS ======
@@ -34,6 +34,11 @@ BUILD_DIR := $(BUILD_ROOT_DIR)/$(OS)-$(ARCH)
 OUTPUT_ROOT_DIR := $(CURDIR)/vendor
 OUTPUT_DIR := $(OUTPUT_ROOT_DIR)/$(OS)-$(ARCH)
 
+ERROR_COLOUR=\033[31m
+GREEN_COLOUR=\033[32m
+MAGENTA_COLOUR=\033[35m
+RESET_COLOUR=\033[0m
+
 # ====== HELPERS ======
 
 downcase = $(shell echo $1 | tr A-Z a-z)
@@ -144,22 +149,20 @@ 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 || \
-		file -b $(OUTPUT_DIR)/$1 | grep -q '$(ARCH_STRING)' || \
-		(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 -o $3 || \
-		(echo "Expected $3, got $$($(OUTPUT_DIR)/$1 $2)"; false)
+	@test -f $(OUTPUT_DIR)/$1 || \
+		{ printf "$(ERROR_COLOUR)no $1 found$(RESET_COLOUR)\n"; exit 1; }
+	@printf "$1: "; \
+		VERSION=$$($(OUTPUT_DIR)/$1 $2 | fgrep -o $3) || \
+		{ printf "$(ERROR_COLOUR)Expected $3, got $$($(OUTPUT_DIR)/$1 $2)$(RESET_COLOUR)\n"; exit 1; }; \
+		ARCH=$$(file -b $(OUTPUT_DIR)/$1 | fgrep -o '$(ARCH_STRING)') || \
+		{ printf "$(ERROR_COLOUR)Expected $(ARCH_STRING), got $$(file -b $(OUTPUT_DIR)/$1)$(RESET_COLOUR)\n"; exit 1; }; \
+		printf "$(GREEN_COLOUR)$$VERSION$(RESET_COLOUR) / $(MAGENTA_COLOUR)$$ARCH$(RESET_COLOUR)\n"
 endef
 
 ifdef IS_DARWIN
 test : ARCH_STRING := $(ARCH)
 else ifeq (i386,$(ARCH:i686=i386))
-test : ARCH_STRING := Intel 80386
+test : ARCH_STRING := 80386
 else ifeq (amd64,$(ARCH:x86_64=amd64))
 test : ARCH_STRING := x86-64
 endif

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 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
 make all # same

data/Vagrantfile

@@ -4,6 +4,14 @@ Vagrant.configure('2') do |config|
   # don't mess with keys
   config.ssh.insert_key = false
 
+  # doesn't make sense to check updates for local boxes
+  config.vm.box_check_update = false
+
+  # there are no guest additions
+  config.vm.provider 'virtualbox' do |vb|
+    vb.check_guest_additions = false
+  end
+
   # handle manually using rsync
   config.vm.synced_folder '.', '/vagrant', disabled: true
 

data/boxes/.rubocop.yml

@@ -3,6 +3,9 @@ inherit_from: ../.rubocop.yml
 Lint/Eval:
   Exclude: [Rakefile]
 
+Lint/UnneededSplatExpansion:
+  Enabled: false
+
 Metrics/LineLength:
   Enabled: false
 

data/image_optim_pack.gemspec

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

@@ -2,26 +2,44 @@
 
 # Build tools on Mac OS X host and in all vms
 
-set -ex
+set -e
 
 MAKE_TASK='all -j'
 
+filters=()
 for arg in "$@"; do
   if [[ "$arg" =~ ^([A-Z_]+)=(.*)$ ]]; then
     eval "$(printf %q=%q "${BASH_REMATCH[1]}" "${BASH_REMATCH[2]}")"
+  else
+    filters+=($arg)
   fi
 done
+filters=$(IFS='|'; echo "${filters[*]}")
 
-if [ `uname -s` != 'Darwin' ]; then
+passes-filter() {
+  [[ '' = "$filters" ]] || [[ "$1" =~ $filters ]]
+}
+
+header() {
+  printf '\033[1;7m######## %s ########\033[0m\n' "$1"
+}
+
+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"
+
   make $MAKE_TASK ARCH=$arch
 done
 
-for vm in $(vagrant status --machine-readable | cut -d, -f2 | sort -u); do
+for vm in $(perl -pe "s/.*?'(.+?-.+?)'.*|.*/\$1/" Vagrantfile | sort -u); do
+  passes-filter "$vm" || continue
+  header "$vm"
+
   vagrant up $vm
 
   # create ssh config
@@ -33,8 +51,9 @@ for vm in $(vagrant status --machine-readable | cut -d, -f2 | sort -u); do
   rsync -e "ssh -F $ssh_config" -aR --del Makefile download vendor/$vm $vm:/vagrant
 
   # sync time and run make
-  vagrant ssh $vm -c "
-    set -ex
+  ssh -F $ssh_config $vm "
+    set -e
+
     sudo ntpdate pool.ntp.org
 
     cd /vagrant
@@ -48,5 +67,5 @@ for vm in $(vagrant status --machine-readable | cut -d, -f2 | sort -u); do
   # rsync files in vendor from the box
   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,72 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.3.0.20160905
+  version: 0.3.0.20160927
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: fspath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.36'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.36'
 description: 
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -227,12 +241,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -240,10 +254,9 @@ rubyforge_project: image_optim_pack
 rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
-summary: ! 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,
+summary: 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,
   jpegoptim, jpegtran, optipng, pngcrush, pngquant'
 test_files:
 - spec/image_optim/pack_spec.rb
 - spec/image_optim_spec.rb
 - spec/spec_helper.rb
-has_rdoc: