squib 0.15.2 → 0.15.3

data/RELEASE TODO.md

@@ -1,21 +1,21 @@
-Be sure to remember to do the following for releases. (Copy into a GitHub issue)
-
- - [ ] CHANGELOG is written for all new changes
- - [ ] README is updated
- - [ ] Samples are updated
- - [ ] Are all the dependencies up to date?
- - [ ] Check `sample_regression_spec.rb` regression tests are all enabled (i.e. `overwrite_sample` is commented out)
- - [ ] Bump version.rb
- - [ ] Bump docs/conf.py versions
- - [ ] Do a full rake locally
- - [ ] `rake sanity`, and check visually
- - [ ] Travis is passing on dev branch
- - [ ] Merge master branch
- - [ ] Merge release branch
- - [ ] Push master and release branches
- - [ ] Create GitHub release tag
- - [ ] `gem push pkg/squib-x.y.z.gem`
- - [ ] Github milestone closed
- - [ ] Activate version on squib.readthedocs.org
- - [ ] Bump version.rb to the next alpha
- - [ ] Publish on BoardGameGeek thread
+Be sure to remember to do the following for releases. (Copy into a GitHub issue)
+
+ - [ ] CHANGELOG is written for all new changes
+ - [ ] README is updated
+ - [ ] Samples are updated
+ - [ ] Are all the dependencies up to date?
+ - [ ] Check `sample_regression_spec.rb` regression tests are all enabled (i.e. `overwrite_sample` is commented out)
+ - [ ] Bump version.rb
+ - [ ] Bump docs/conf.py versions
+ - [ ] Do a full rake locally
+ - [ ] `rake sanity`, and check visually
+ - [ ] Travis is passing on dev branch
+ - [ ] Merge master branch
+ - [ ] Merge release branch
+ - [ ] Push master and release branches
+ - [ ] Create GitHub release tag
+ - [ ] `gem push pkg/squib-x.y.z.gem`
+ - [ ] Github milestone closed
+ - [ ] Activate version on squib.readthedocs.org
+ - [ ] Bump version.rb to the next alpha
+ - [ ] Publish on BoardGameGeek thread

data/Rakefile

@@ -1,48 +1,48 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'benchmark'
-# require 'byebug'
-
-desc 'install + spec'
-task default: ['install:local', :spec]
-
-# Useful for hooking up with SublimeText.
-# e.g. rake sample[basic.rb]
-desc 'Run a specific sample'
-task :run, [:file] => :install do |t, args|
-  args.with_defaults(file: 'basic.rb')
-  Dir.chdir('samples') do
-    args[:file] << '.rb' unless args[:file].end_with? '.rb'
-    puts "Running samples/#{args[:file]}"
-    load args[:file]
-  end
-end
-
-RSpec::Core::RakeTask.new(:spec)
-
-RSpec::Core::RakeTask.new(:spec_fastonly) do |t|
-  t.rspec_opts = '--tag ~slow'
-end
-
-desc 'Run some performance benchmarks'
-task benchmark: [:install] do
-  require 'squib'
-  Squib::logger.level = Logger::ERROR # silence warnings
-  Dir.chdir('benchmarks') do
-    Benchmark.bm(15) do |bm|
-      Dir['*.rb'].each do | script |
-        GC.start
-        bm.report(script) { load script }
-      end
-    end
-  end
-end
-
-desc 'Run sanity tests without a full rebuild'
-task :sanity_only do
-  require_relative 'spec/sanity/sanity_test.rb'
-  SanityTest.new.run
-end
-
-desc 'Run full rebuild with sanity tests'
-task sanity: [:install, :spec, :sanity_only]
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'benchmark'
+# require 'byebug'
+
+desc 'install + spec'
+task default: ['install:local', :spec]
+
+# Useful for hooking up with SublimeText.
+# e.g. rake sample[basic.rb]
+desc 'Run a specific sample'
+task :run, [:file] => :install do |t, args|
+  args.with_defaults(file: 'basic.rb')
+  Dir.chdir('samples') do
+    args[:file] << '.rb' unless args[:file].end_with? '.rb'
+    puts "Running samples/#{args[:file]}"
+    load args[:file]
+  end
+end
+
+RSpec::Core::RakeTask.new(:spec)
+
+RSpec::Core::RakeTask.new(:spec_fastonly) do |t|
+  t.rspec_opts = '--tag ~slow'
+end
+
+desc 'Run some performance benchmarks'
+task benchmark: [:install] do
+  require 'squib'
+  Squib::logger.level = Logger::ERROR # silence warnings
+  Dir.chdir('benchmarks') do
+    Benchmark.bm(15) do |bm|
+      Dir['*.rb'].each do | script |
+        GC.start
+        bm.report(script) { load script }
+      end
+    end
+  end
+end
+
+desc 'Run sanity tests without a full rebuild'
+task :sanity_only do
+  require_relative 'spec/sanity/sanity_test.rb'
+  SanityTest.new.run
+end
+
+desc 'Run full rebuild with sanity tests'
+task sanity: [:install, :spec, :sanity_only]

data/appveyor.yml

@@ -1,25 +1,25 @@
-version: '{build}'
-
-skip_tags: true
-
-environment:
-  matrix:
-    - ruby_version: "24"
-    - ruby_version: "24-x64"
-    - ruby_version: "25"
-    - ruby_version: "25-x64"
-    - ruby_version: "26"
-    - ruby_version: "26-x64"
-
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - ruby --version
-  - gem --version
-  - gem install bundler
-  - bundler --version
-  - bundle install
-
-test_script:
-  - rake
-
-build: off
+version: '{build}'
+
+skip_tags: true
+
+environment:
+  matrix:
+    - ruby_version: "24"
+    - ruby_version: "24-x64"
+    - ruby_version: "25"
+    - ruby_version: "25-x64"
+    - ruby_version: "26"
+    - ruby_version: "26-x64"
+
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ruby --version
+  - gem --version
+  - gem install bundler
+  - bundler --version
+  - bundle install
+
+test_script:
+  - rake
+
+build: off

data/bin/squib

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
-require 'squib'
-
-Squib::CLI.new.run
+#!/usr/bin/env ruby
+require 'squib'
+
+Squib::CLI.new.run

data/lib/squib.rb

@@ -1,32 +1,32 @@
-require 'logger'
-require 'cairo'
-require 'pango'
-require 'rsvg2'
-require_relative 'squib/version'
-require_relative 'squib/commands/cli'
-require_relative 'squib/deck'
-require_relative 'squib/card'
-
-module Squib
-
-  # Access the internal logger that Squib uses. By default, Squib configure the logger to the WARN level
-  # Use this to suppress or increase output levels.
-  # @example
-  #   Squib.logger.level = Logger::DEBUG #show waaaay more information than you probably need, unless you're a dev
-  #   Squib.logger.level = Logger::ERROR #basically turns it off
-  #
-  # @return [Logger] the ruby logger
-  # @api public
-  def logger
-    if @logger.nil?
-      @logger = Logger.new($stdout)
-      @logger.level = Logger::WARN
-      @logger.formatter = proc do |severity, datetime, m_progname, msg|
-        "#{datetime} #{severity}: #{msg}\n"
-      end
-    end
-    @logger
-  end
-  module_function :logger
-
-end
+require 'logger'
+require 'cairo'
+require 'pango'
+require 'rsvg2'
+require_relative 'squib/version'
+require_relative 'squib/commands/cli'
+require_relative 'squib/deck'
+require_relative 'squib/card'
+
+module Squib
+
+  # Access the internal logger that Squib uses. By default, Squib configure the logger to the WARN level
+  # Use this to suppress or increase output levels.
+  # @example
+  #   Squib.logger.level = Logger::DEBUG #show waaaay more information than you probably need, unless you're a dev
+  #   Squib.logger.level = Logger::ERROR #basically turns it off
+  #
+  # @return [Logger] the ruby logger
+  # @api public
+  def logger
+    if @logger.nil?
+      @logger = Logger.new($stdout)
+      @logger.level = Logger::WARN
+      @logger.formatter = proc do |severity, datetime, m_progname, msg|
+        "#{datetime} #{severity}: #{msg}\n"
+      end
+    end
+    @logger
+  end
+  module_function :logger
+
+end

data/lib/squib/api/background.rb

@@ -1,15 +1,15 @@
-require_relative '../args/card_range'
-require_relative '../args/draw'
-
-module Squib
-  class Deck
-
-    # DSL method. See http://squib.readthedocs.io
-    def background(opts = {})
-      range = Args::CardRange.new(opts[:range], deck_size: size)
-      draw  = Args::Draw.new(custom_colors).load!(opts, expand_by: size, layout: layout, dpi: dpi)
-      range.each { |i| @cards[i].background(draw.color[i]) }
-    end
-
-  end
-end
+require_relative '../args/card_range'
+require_relative '../args/draw'
+
+module Squib
+  class Deck
+
+    # DSL method. See http://squib.readthedocs.io
+    def background(opts = {})
+      range = Args::CardRange.new(opts[:range], deck_size: size)
+      draw  = Args::Draw.new(custom_colors).load!(opts, expand_by: size, layout: layout, dpi: dpi)
+      range.each { |i| @cards[i].background(draw.color[i]) }
+    end
+
+  end
+end

data/lib/squib/api/data.rb

@@ -1,137 +1,137 @@
-require 'roo'
-require 'csv'
-require 'yaml'
-require_relative '../args/input_file'
-require_relative '../args/import'
-require_relative '../args/csv_opts'
-require_relative '../import/data_frame'
-
-module Squib
-
-  # DSL method. See http://squib.readthedocs.io
-  def xlsx(opts = {})
-    input = Args::InputFile.new(file: 'deck.xlsx').load!(opts)
-    import = Args::Import.new.load!(opts)
-    s = Roo::Excelx.new(input.file[0])
-    s.default_sheet = s.sheets[input.sheet[0]]
-    data = Squib::DataFrame.new
-    s.first_column.upto(s.last_column) do |col|
-      header = s.cell(s.first_row, col).to_s
-      header.strip! if import.strip?
-      data[header] = []
-      (s.first_row + 1).upto(s.last_row) do |row|
-        cell = s.cell(row, col)
-        # Roo hack for avoiding unnecessary .0's on whole integers (https://github.com/roo-rb/roo/issues/139)
-        cell = s.excelx_value(row, col) if s.excelx_type(row, col) == [:numeric_or_formula, 'General']
-        cell.strip! if cell.respond_to?(:strip) && import.strip?
-        cell = yield(header, cell) if block_given?
-        data[header] << cell
-      end# row
-    end# col
-    explode_quantities(data, import.explode)
-  end# xlsx
-  module_function :xlsx
-
-  # DSL method. See http://squib.readthedocs.io
-  def csv(opts = {})
-    # TODO refactor all this out to separate methods, and its own class
-    import = Args::Import.new.load!(opts)
-    file = Args::InputFile.new(file: 'deck.csv').load!(opts).file[0]
-    data = opts.key?(:data) ? opts[:data] : File.read(file)
-    csv_opts = Args::CSV_Opts.new(opts)
-    table = CSV.parse(data, csv_opts.to_hash)
-    check_duplicate_csv_headers(table)
-    hash = Squib::DataFrame.new
-    table.headers.each do |header|
-      new_header = header.to_s
-      new_header = new_header.strip if import.strip?
-      hash[new_header] ||= table[header]
-    end
-    if import.strip?
-      new_hash = Squib::DataFrame.new
-      hash.each do |header, col|
-        new_hash[header] = col.map do |str|
-          str = str.strip if str.respond_to?(:strip)
-          str
-        end
-      end
-      hash = new_hash
-    end
-    if block_given?
-      hash.each do |header, col|
-        col.map! do |val|
-          yield(header, val)
-        end
-      end
-    end
-    return explode_quantities(hash, import.explode)
-  end
-  module_function :csv
-
-  # DSL method. See http://squib.readthedocs.io
-  def yaml(opts = {})
-    input = Args::InputFile.new(file: 'deck.yml').load!(opts)
-    import = Args::Import.new.load!(opts)
-    yml = YAML.load_file(input.file[0])
-    data = Squib::DataFrame.new
-    # Get a universal list of keys to ensure everything is covered.
-    keys = yml.map { |c| c.keys}.flatten.uniq
-    keys.each { |k| data[k] = [] } #init arrays
-    yml.each do |card|
-      # nil value if key isn't set.
-      keys.each { |k| data[k] << card[k] }
-    end
-    if block_given?
-      data.each do |header, col|
-        col.map! do |val|
-          yield(header, val)
-        end
-      end
-    end
-    explode_quantities(data, import.explode)
-  end
-  module_function :yaml
-
-  # Check if the given CSV table has duplicate columns, and throw a warning
-  # @api private
-  def check_duplicate_csv_headers(table)
-    if table.headers.size != table.headers.uniq.size
-      dups = table.headers.select{|e| table.headers.count(e) > 1 }
-      Squib.logger.warn "CSV duplicated the following column keys: #{dups.join(',')}"
-    end
-  end
-  module_function :check_duplicate_csv_headers
-
-  # @api private
-  def explode_quantities(data, qty)
-    return data unless data.col? qty.to_s.strip
-    qtys = data[qty]
-    new_data = Squib::DataFrame.new
-    data.each do |col, arr|
-      new_data[col] = []
-      qtys.each_with_index do |qty, index|
-        qty.to_i.times { new_data[col] << arr[index] }
-      end
-    end
-    return new_data
-  end
-  module_function :explode_quantities
-
-  class Deck
-
-    # DSL method. See http://squib.readthedocs.io
-    def xlsx(opts = {})
-      Squib.xlsx(opts)
-    end
-
-    # DSL method. See http://squib.readthedocs.io
-    def csv(opts = {})
-      Squib.csv(opts)
-    end
-
-    # DSL method. See http://squib.readthedocs.io
-    def yaml(opts = {})
-      Squib.yaml(opts)
-    end
-  end
-end
+require 'roo'
+require 'csv'
+require 'yaml'
+require_relative '../args/input_file'
+require_relative '../args/import'
+require_relative '../args/csv_opts'
+require_relative '../import/data_frame'
+
+module Squib
+
+  # DSL method. See http://squib.readthedocs.io
+  def xlsx(opts = {})
+    input = Args::InputFile.new(file: 'deck.xlsx').load!(opts)
+    import = Args::Import.new.load!(opts)
+    s = Roo::Excelx.new(input.file[0])
+    s.default_sheet = s.sheets[input.sheet[0]]
+    data = Squib::DataFrame.new
+    s.first_column.upto(s.last_column) do |col|
+      header = s.cell(s.first_row, col).to_s
+      header.strip! if import.strip?
+      data[header] = []
+      (s.first_row + 1).upto(s.last_row) do |row|
+        cell = s.cell(row, col)
+        # Roo hack for avoiding unnecessary .0's on whole integers (https://github.com/roo-rb/roo/issues/139)
+        cell = s.excelx_value(row, col) if s.excelx_type(row, col) == [:numeric_or_formula, 'General']
+        cell.strip! if cell.respond_to?(:strip) && import.strip?
+        cell = yield(header, cell) if block_given?
+        data[header] << cell
+      end# row
+    end# col
+    explode_quantities(data, import.explode)
+  end# xlsx
+  module_function :xlsx
+
+  # DSL method. See http://squib.readthedocs.io
+  def csv(opts = {})
+    # TODO refactor all this out to separate methods, and its own class
+    import = Args::Import.new.load!(opts)
+    file = Args::InputFile.new(file: 'deck.csv').load!(opts).file[0]
+    data = opts.key?(:data) ? opts[:data] : File.read(file)
+    csv_opts = Args::CSV_Opts.new(opts)
+    table = CSV.parse(data, csv_opts.to_hash)
+    check_duplicate_csv_headers(table)
+    hash = Squib::DataFrame.new
+    table.headers.each do |header|
+      new_header = header.to_s
+      new_header = new_header.strip if import.strip?
+      hash[new_header] ||= table[header]
+    end
+    if import.strip?
+      new_hash = Squib::DataFrame.new
+      hash.each do |header, col|
+        new_hash[header] = col.map do |str|
+          str = str.strip if str.respond_to?(:strip)
+          str
+        end
+      end
+      hash = new_hash
+    end
+    if block_given?
+      hash.each do |header, col|
+        col.map! do |val|
+          yield(header, val)
+        end
+      end
+    end
+    return explode_quantities(hash, import.explode)
+  end
+  module_function :csv
+
+  # DSL method. See http://squib.readthedocs.io
+  def yaml(opts = {})
+    input = Args::InputFile.new(file: 'deck.yml').load!(opts)
+    import = Args::Import.new.load!(opts)
+    yml = YAML.load_file(input.file[0])
+    data = Squib::DataFrame.new
+    # Get a universal list of keys to ensure everything is covered.
+    keys = yml.map { |c| c.keys}.flatten.uniq
+    keys.each { |k| data[k] = [] } #init arrays
+    yml.each do |card|
+      # nil value if key isn't set.
+      keys.each { |k| data[k] << card[k] }
+    end
+    if block_given?
+      data.each do |header, col|
+        col.map! do |val|
+          yield(header, val)
+        end
+      end
+    end
+    explode_quantities(data, import.explode)
+  end
+  module_function :yaml
+
+  # Check if the given CSV table has duplicate columns, and throw a warning
+  # @api private
+  def check_duplicate_csv_headers(table)
+    if table.headers.size != table.headers.uniq.size
+      dups = table.headers.select{|e| table.headers.count(e) > 1 }
+      Squib.logger.warn "CSV duplicated the following column keys: #{dups.join(',')}"
+    end
+  end
+  module_function :check_duplicate_csv_headers
+
+  # @api private
+  def explode_quantities(data, qty)
+    return data unless data.col? qty.to_s.strip
+    qtys = data[qty]
+    new_data = Squib::DataFrame.new
+    data.each do |col, arr|
+      new_data[col] = []
+      qtys.each_with_index do |qty, index|
+        qty.to_i.times { new_data[col] << arr[index] }
+      end
+    end
+    return new_data
+  end
+  module_function :explode_quantities
+
+  class Deck
+
+    # DSL method. See http://squib.readthedocs.io
+    def xlsx(opts = {})
+      Squib.xlsx(opts)
+    end
+
+    # DSL method. See http://squib.readthedocs.io
+    def csv(opts = {})
+      Squib.csv(opts)
+    end
+
+    # DSL method. See http://squib.readthedocs.io
+    def yaml(opts = {})
+      Squib.yaml(opts)
+    end
+  end
+end