image_optim_pack 0.5.0.20170830 → 0.5.0.20170831

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f81e543474ef77214d96151e635afa958a39c92b
-  data.tar.gz: adba475c0d994b81ca253b7eb5a24e0e55c334ab
+  metadata.gz: ee92e0df607ff89c425b06527be70b51f32a0ded
+  data.tar.gz: 9c95407e8a1619787ebc93adea3781154f31864a
 SHA512:
-  metadata.gz: a66554e0873d899a8afc5ee18a57fcf96b7f19eca1c55d58ceabae74929a4e244a9d1333ec4762e20ee2a16253bfde60c202ab3a29f0a8f96968cfe328a4cf82
-  data.tar.gz: 0c4027b85d605cc33403a6507e36e777f60e82436c56e17f7bf3b5c794d1917e991a2832eb21e596f2d771afc19d99eaeda998f483ab33fdbaaaa159f47b395b
+  metadata.gz: fdca27029f7d84cab18497d146abcc0b18d590feb4407f1d9e71143dec08cf3603e63349e06dd0c556617130576f5602b9522414078ac53883101bcc56ea1729
+  data.tar.gz: 127551232bb05760c9ef0df1ee9085403f37cfc2654034e07e224e6ae2e54036c7e34312bb3834c2144fc8ebc04543c9c374afe15369f72262a319ee096b9738

data/.rubocop.yml

@@ -61,9 +61,6 @@ Style/Semicolon:
 Style/SignalException:
   EnforcedStyle: semantic
 
-Style/SpecialGlobalVars:
-  Enabled: false
-
 Style/SymbolArray:
   Enabled: false
 

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v0.5.0.20170831 (2017-08-31)
+
+* pngcrush 1.8.13 [@toy](https://github.com/toy)
+
 ## v0.5.0.20170830 (2017-08-30)
 
 * libpng 1.6.32 [@toy](https://github.com/toy)

data/Makefile

@@ -12,7 +12,7 @@ LIBMOZJPEG_VER := 3.1
 LIBPNG_VER := 1.6.32
 LIBZ_VER := 1.2.11
 OPTIPNG_VER := 0.7.6
-PNGCRUSH_VER := 1.8.12
+PNGCRUSH_VER := 1.8.13
 PNGQUANT_VER := 2.10.2
 
 # ====== CONSTANTS ======
@@ -193,14 +193,10 @@ test :
 	$(call check_bin,pngquant,--help,$(PNGQUANT_VER))
 .PHONY : test
 
-livecheck :; @$(foreach archive,$(ARCHIVES),script/livecheck $(call downcase,$(archive)) $($(archive)_VER);)
+livecheck :; @script/livecheck
 .PHONY : livecheck
 
-Makefile.updated :
-	cat Makefile | script/update_versions > Makefile.updated
-
-update-versions : Makefile.updated
-	mv Makefile.updated Makefile
+update-versions :; @script/livecheck --update
 .PHONY : update-versions
 
 # ====== CLEAN ======

data/image_optim_pack.gemspec

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

@@ -1,82 +1,173 @@
 #!/usr/bin/env ruby
 
-# Get latest version of tools
-
 require 'yaml'
 require 'uri'
 require 'net/http'
+require 'openssl'
 require 'rubygems/version'
+require 'fspath'
+
+# Fetch and compare latest tool/library versions
+class Livecheck
+  # Commands
+  class Cli
+    VERSION_REGEXP = /^([A-Z]+)_VER *:= *(.*)$/
+
+    def initialize(args)
+      @update = args.delete('--update')
+      abort '--update is the only supported option' unless args.empty?
+    end
+
+    def run
+      dump_changes
+
+      return unless @update
+      return unless livechecks.any?(&:changed?)
+
+      update_changelog
+      update_makefile
+    end
+
+  private
+
+    def dump_changes
+      livechecks.each do |lc|
+        next unless lc.changed?
+        puts "#{lc.name_n_latest_version} (current: #{lc.current_version})"
+      end
+    end
 
-# Compare versions including libjpeg ones (9b <=> 9)
-class Version
-  include Comparable
+    def update_changelog
+      changelog = FSPath('CHANGELOG.markdown')
+      lines = changelog.readlines
+      lines.insert(4, "\n") if lines[4] =~ /^## /
+      lines.insert(4, changelog_entry)
+      write(changelog, lines.join(''))
+    end
+
+    def update_makefile
+      content = makefile.read.gsub(VERSION_REGEXP) do
+        livecheck = livechecks_by_name[Regexp.last_match[1].downcase]
+        "#{livecheck.name.upcase}_VER := #{livecheck.latest_version}"
+      end
+      write(makefile, content)
+    end
+
+    def makefile
+      FSPath('Makefile')
+    end
+
+    def livechecks
+      @livechecks ||= makefile.read.scan(VERSION_REGEXP).map do |name, version|
+        Livecheck.new(name.downcase, version)
+      end
+    end
+
+    def livechecks_by_name
+      @livechecks_by_name ||= Hash[livechecks.map{ |lc| [lc.name, lc] }]
+    end
+
+    def changelog_entry
+      github_user = `git config github.user`.strip
+      changed = livechecks.select(&:changed?)
+      %W[
+        *
+        #{to_sentence(changed.map(&:name_n_latest_version))}
+        [@#{github_user}](https://github.com/#{github_user})
+      ].join(' ') + "\n"
+    end
 
-  attr_reader :string, :parsed
-  alias_method :to_s, :string
+    def to_sentence(array)
+      case array.length
+      when 0 then ''
+      when 1 then array[0].to_s
+      else "#{array[0...-1].join(', ')} and #{array[-1]}"
+      end
+    end
 
-  def initialize(string)
-    @string = string
-    @parsed = begin
-      Gem::Version.new(string)
-    rescue ArgumentError
-      nil
+    def write(path, data)
+      path.temp_file(path.dirname) do |io|
+        io.write data
+        io.path.rename(path)
+      end
+      warn "Wrote #{path}"
     end
   end
 
-  def <=>(other)
-    if parsed && other.parsed
-      parsed <=> other.parsed
-    else
-      string <=> other.string
+  # 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
-end
 
-bare = ARGV.delete('--bare')
+  CONFIG = YAML.load(DATA).freeze
 
-unless [1, 2].include?(ARGV.length)
-  abort 'expected project name and optional current version'
-end
+  attr_reader :name, :current_version
 
-def version(string)
-  Version.new(string)
-end
+  def initialize(name, current_version)
+    @name = name
+    @current_version = Version.new(current_version)
+    @fetcher = Thread.new{ fetch_versions.last }
+  end
+
+  def latest_version
+    @fetcher.value
+  end
 
-def get(url)
-  uri = URI(url)
+  def changed?
+    latest_version != current_version
+  end
 
-  http = Net::HTTP.new(uri.host, uri.port)
-  http.use_ssl = (uri.scheme == 'https')
+  def name_n_latest_version
+    "#{name} #{latest_version}"
+  end
 
-  request = Net::HTTP::Get.new(uri.request_uri)
-  http.request(request).body
-end
+private
 
-name = ARGV[0].downcase
-config = YAML.load(DATA)[name]
-abort "Livecheck for #{name} was not defined" unless config
-
-url = config['url']
-version_regex = Regexp.new(config['regexp'])
-current_version = ARGV[1] && version(ARGV[1])
-
-data = get(url)
-versions = data.scan(version_regex).uniq.map{ |match| version(match[0]) }
-abort "No versions found for #{name} in data:\n#{data}" if versions.empty?
-
-latest_version = versions.max
-case
-when bare
-  print latest_version
-when current_version
-  if latest_version != current_version
-    sign = latest_version > current_version ? '>' : '<'
-    puts "#{name} #{latest_version} #{sign} #{current_version}"
+  def config
+    CONFIG[name] || fail(ArgumentError, "Livecheck for #{name} not defined")
+  end
+
+  def get(url)
+    uri = URI(url)
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = (uri.scheme == 'https')
+    http.request_get(uri.request_uri).body
+  end
+
+  def fetch_versions
+    body = get(config['url'])
+
+    version_regex = Regexp.new(config['regexp'])
+
+    versions = body.scan(version_regex).map{ |match| Version.new(*match) }.sort
+    fail "No versions found for #{name} in body:\n#{body}" if versions.empty?
+
+    versions
   end
-else
-  puts "#{name} #{latest_version}"
 end
 
+Livecheck::Cli.new(ARGV).run
+
 __END__
 advancecomp:
   url: https://github.com/amadvance/advancecomp/releases.atom

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.5.0.20170830
+  version: 0.5.0.20170831
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -135,7 +135,6 @@ files:
 - lib/image_optim_pack.rb
 - script/livecheck
 - script/run
-- script/update_versions
 - spec/image_optim/pack_spec.rb
 - spec/image_optim_spec.rb
 - spec/spec_helper.rb

data/script/update_versions

@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-
-# Feed Makefile to this script to set all variables XXX_VER to latest versions
-
-ARGF.map do |line|
-  if (name = line[/^([A-Z]+)_VER *:= *.*/, 1])
-    Thread.new do
-      version = `script/livecheck --bare #{name}`.strip
-      abort unless $?.success?
-      "#{name}_VER := #{version}\n"
-    end
-  else
-    line
-  end
-end.each do |out|
-  if out.respond_to?(:value)
-    $stderr << out.value unless $stdout.tty?
-    $stdout << out.value
-  else
-    $stdout << out
-  end
-end