image_optim_pack 0.2.3 → 0.3.0

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

@@ -0,0 +1,71 @@
+Veewee::Session.declare({
+  :cpu_count => '1',
+  :memory_size => '512',
+  :disk_size => '8192',
+  :disk_format => 'VDI',
+  :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_sha256 => '43798eb4f459b58062167c24337230e96c78b01887a4be40d89279df379f3565',
+  :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
+    '<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]
+    '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]
+    '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>',
+    'done<Enter>',
+    '<Wait>',
+    'yes<Enter>',           # CD does not contain SHA256.sig (5.5) Continue without verification?
+    'done<Enter>',          # Done installing ?
+    '<Wait>' * 6,
+    'yes<Enter><Wait>',     # Time appears wrong. Set to ...? [yes]
+    '<Wait>' * 6,
+    'reboot<Enter>',
+    '<Wait>' * 6,
+  ],
+  :kickstart_port => '7122',
+  :kickstart_timeout => '300',
+  :kickstart_file => '',
+  :ssh_login_timeout => '10000',
+  :ssh_user => 'root',
+  :ssh_password => 'vagrant',
+  :ssh_key => '',
+  :ssh_host_port => '7222',
+  :ssh_guest_port => '22',
+  :sudo_cmd => "sh '%f'",
+  :shutdown_cmd => '/sbin/halt -p',
+  :postinstall_files => %w[../openbsd-postinstall.sh],
+  :postinstall_timeout => '10000',
+  :skip_iso_transfer => true,
+})

data/boxes/definitions/openbsd-postinstall.sh

@@ -0,0 +1,29 @@
+set -ex
+
+date > /etc/vagrant_box_build_time
+
+# set pkg path for users
+export PKG_PATH=http://ftp3.usa.openbsd.org/pub/OpenBSD/`uname -r`/packages/`arch -s`/
+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
+
+# set vagrant shell to bash
+usermod -s /usr/local/bin/bash vagrant
+
+# sudo
+echo "# Uncomment to allow people in group wheel to run all commands without a password" >> /etc/sudoers
+echo "%wheel        ALL=(ALL) NOPASSWD: SETENV: ALL" >> /etc/sudoers
+
+# setup the vagrant key
+mkdir -p /home/vagrant/.ssh
+chmod 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 600 /home/vagrant/.ssh/authorized_keys
+chown -R vagrant.vagrant /home/vagrant/.ssh
+
+perl -pi -e 's/(?<=:maxproc-(?:max|cur)=)\d+(?=:)/1024/' -- /etc/login.conf
+
+/sbin/halt -p

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.2.3'
+  s.version     = '0.3.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']
@@ -18,10 +18,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'image_optim', '~> 0.19'
   s.add_dependency 'fspath', '>= 2.1', '< 4'
 
-  s.add_development_dependency 'versionomy', '~> 0.4.4'
-  s.add_development_dependency 'blockenspiel', '~> 0.4.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9.3')
+  if RUBY_VERSION >= '2.0'
     s.add_development_dependency 'rubocop', '~> 0.36'
   end
 end

data/lib/image_optim/pack.rb

@@ -19,8 +19,7 @@ class ImageOptim
       # Receive path, use last part for arch and last but one part for os
       def initialize(path)
         @path = FSPath(path)
-        @os = @path.dirname.basename.to_s
-        @arch = @path.basename.to_s
+        @os, @arch = @path.basename.to_s.split('-', 2)
       end
 
       # Return path converted to string
@@ -81,7 +80,7 @@ class ImageOptim
     VENDOR_PATH = FSPath('../../../vendor').expand_path(__FILE__)
 
     # List of paths
-    PATHS = VENDOR_PATH.glob('*/*').map{ |path| Path.new(path) }
+    PATHS = VENDOR_PATH.glob('*-*').map{ |path| Path.new(path) }
 
     class << self
       # Return path to directory with binaries

data/script/livecheck

@@ -1,9 +1,36 @@
 #!/usr/bin/env ruby
 
+# Get latest version of tools
+
 require 'yaml'
 require 'uri'
 require 'net/http'
-require 'versionomy'
+require 'rubygems/version'
+
+# Compare versions including libjpeg ones (9b <=> 9)
+class Version
+  include Comparable
+
+  attr_reader :string, :parsed
+  alias_method :to_s, :string
+
+  def initialize(string)
+    @string = string
+    @parsed = begin
+      Gem::Version.new(string)
+    rescue ArgumentError
+      nil
+    end
+  end
+
+  def <=>(other)
+    if parsed && other.parsed
+      parsed <=> other.parsed
+    else
+      string <=> other.string
+    end
+  end
+end
 
 bare = ARGV.delete('--bare')
 
@@ -12,7 +39,7 @@ unless [1, 2].include?(ARGV.length)
 end
 
 def version(string)
-  Versionomy.parse(string)
+  Version.new(string)
 end
 
 def get(url)

data/script/run

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 
-set -xe
+# Build tools on Mac OS X host and in all vms
 
-MAKE_COMMAND='make all -j'
+set -ex
+
+MAKE_TASK='all -j'
 
 for arg in "$@"; do
   if [[ "$arg" =~ ^([A-Z_]+)=(.*)$ ]]; then
@@ -10,17 +12,41 @@ for arg in "$@"; do
   fi
 done
 
-if [ "$(uname -s | tr A-Z a-z)" != '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
-  $MAKE_COMMAND ARCH=$arch
+  make $MAKE_TASK ARCH=$arch
 done
 
-for vm in linux_{i686,x86_64}; do
+for vm in $(vagrant status --machine-readable | cut -d, -f2 | sort -u); do
   vagrant up $vm
-  vagrant ssh $vm -c "cd /vagrant; $MAKE_COMMAND"
+
+  # create 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 download vendor/$vm $vm:/vagrant
+
+  # sync time and run make
+  vagrant ssh $vm -c "
+    set -ex
+    sudo ntpdate pool.ntp.org
+
+    cd /vagrant
+    if make -v 2>&1 | grep -q GNU\ Make; then
+      make $MAKE_TASK
+    else
+      gmake $MAKE_TASK
+    fi
+  "
+
+  # 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
 done

data/script/update_versions

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# Feed Makefile to this script to set all variables XXX_VER to latest versions
+
 require 'English'
 
 tty = $stdout.tty?

data/spec/image_optim/pack_spec.rb

@@ -37,13 +37,13 @@ describe ImageOptim::Pack do
 
     describe :os do
       it 'returns last but one part of path' do
-        expect(Path.new('path/futureos/Kqbit').os).to eq('futureos')
+        expect(Path.new('path/futureos-K-qbit').os).to eq('futureos')
       end
     end
 
     describe :arch do
       it 'returns last but one part of path' do
-        expect(Path.new('path/futureos/Kqbit').arch).to eq('Kqbit')
+        expect(Path.new('path/futureos-K-qbit').arch).to eq('K-qbit')
       end
     end