softcover 1.1.23 → 1.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0525db14fac2a0c8d3e36fe1730e11aadea0f260
-  data.tar.gz: 6ac3cade0c04ae7cb4c970a4fe13012d4fb70b29
+  metadata.gz: 1a5dbd74f8e322cdad06c5c45fe351ea5601abf0
+  data.tar.gz: 7c03531a20b8bc23ba38e9b7d7fbbcecd48933c1
 SHA512:
-  metadata.gz: c575083b8d00e0262bec7b18d37d9d7d079618409a20bd745081c922bf2fdaef6a402cfc4b0bac1085869be71e665e60fad265c34fb5e56f7680fd4d2d01d247
-  data.tar.gz: c0aa8dc1442c3f738fba7aa99534a7701f146dfd0c538c38a9363fc8aa7bbe305072414620bd4c5cb1b2619367082645845bb342bb2890f18df9403f1c116732
+  metadata.gz: aec06635901ec87431a6b762ef8a2957858dd71581615d60bd7e42ddaa122e689d6a9d9a085cd0f837ba7896fed3033f8870a8b3d9cf0414c5b757cc87dc8d2b
+  data.tar.gz: f6cea38508fbbd35086dbf1b400685bd4f27b5c75588507602ca44452a0ba3bbebae34d5c1282df48db27885e3771ae2bc0d683c4e0f4efc8b60008abbbf0f6a

data/bin/rename_screenshot

@@ -5,19 +5,11 @@ require 'optparse'
 # Renames a screenshot.
 # This is intended for use with Shift-Cmd-4 on Mac OS X.
 # 1. Use Shift-Cmd-4 to take a screenshot
-# 2. Run `rename_screenshot figure_name` to create a full-size figure
-#    called `figure_name.png` in the `full_size_figures` directory.
-# A corresponding smaller resized figure is automagically created
-# in the `images/figures` directory. The idea is to keep the full-size figures
-# in case they're ever needed, but to resize them so they're not too big
-# for inclusion in the document.
+# 2. Run `rename_screenshot figure_name` to create a figure
+#    called `figure_name.png` in the `images/figures/` directory.
 # The method is to look for the most recently modified PNG file on the desktop
-# and move it (while renaming it) to the `full_size_figures` directory. Then
-# a normal-size figure is generated using the `make_figures` script.
+# and move it (while renaming it) to the `images/figures` directory.
 
-def figure(name)
-  "images/figures/#{name}.png"
-end
 
 def rm(filename)
   FileUtils.rm(filename) if File.exist?(filename)
@@ -31,9 +23,6 @@ OptionParser.new do |opts|
     options[:force] = true
   end
 
-  opts.on("-i", "Invert a renaming by removing the relevant images") do
-    options[:invert] = true
-  end
 end.parse!
 
 name = ARGV.shift
@@ -41,14 +30,14 @@ if name.nil?
   puts "usage: rename_screenshot filename [options]"
   exit 1
 end
-FileUtils.mkdir("full_size_figures") unless File.exist?("full_size_figures")
-target = "full_size_figures/#{name}.png"
 
-if options[:invert]
-  rm(target) if File.exist?(target)
-  rm(figure(name))
+unless File.directory?('images/figures')
+  $stderr.puts "ERROR: 'images/figures' doesn't exist. Create and re-run."
+  exit 1
 end
 
+target = "images/figures/#{name}.png"
+
 most_recent = Dir["#{ENV['HOME']}/Desktop/*.png"].sort_by do |a|
                 File.stat(a).mtime
               end.reverse.first
@@ -59,7 +48,5 @@ if File.exist?(target) && !options[:force]
 end
 unless response.downcase == 'n'
   FileUtils.mv(most_recent, target)
-  rm(figure(name))
-  system "make_figures"
-  system "git add -A"
+  system "git add #{target}"
 end

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.1.23"
+  VERSION = "1.1.27"
 end

data/softcover.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'polytexnic', '~> 1.1.12'
+  gem.add_dependency 'polytexnic', '~> 1.1.14'
   gem.add_dependency 'msgpack', '~> 0.4.2'
   gem.add_dependency 'nokogiri', '~> 1.6.0'
   gem.add_dependency 'thor', '~> 0.18.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.1.23
+  version: 1.1.27
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.12
+        version: 1.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.12
+        version: 1.1.14
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -295,7 +295,6 @@ description: Command-line interface for softcover.io
 email:
 - michael@softcover.io
 executables:
-- make_figures
 - rename_screenshot
 - sc
 - softcover
@@ -407,7 +406,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/make_figures
 - bin/rename_screenshot
 - bin/sc
 - bin/softcover

data/bin/make_figures

@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-require 'optparse'
-
-# Makes display figures based on the full-size figures.
-# The idea is to avoid throwing away data by storing full-size figures,
-# but resize them to a size appropriate for use in the document.
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: rename_screenshot [options]"
-
-  opts.on("-a", "Regenerate all figures from full-size images") do
-    options[:all] = true
-  end
-
-  opts.on("-w", "Resize to given width (in pixels)") do |width|
-    options[:width] = width
-  end
-end.parse!
-
-width = (options[:width] || "700") + '\>'
-target_dir = "images/figures"
-Dir.glob('full_size_figures/*').each do |full_size_filename|
-  if full_size_filename =~ /(\w+)-full\.(.*)/
-    # Needed for backwards compatibility.
-    filename = "#{target_dir}/#{$1}.#{$2}"
-  else
-    filename = "#{target_dir}/#{File.basename(full_size_filename)}"
-  end
-  unless File.exist?(filename) && !options[:all]
-    cmd =  "convert #{full_size_filename} -resize #{width} #{filename}"
-    system cmd
-  end
-end
-system "git add -A"