squib 0.0.3 → 0.0.4

data/spec/input_helpers_spec.rb

@@ -1,117 +1,117 @@
-require 'spec_helper'
-require 'squib/input_helpers'
-
-class DummyDeck
-  include  Squib::InputHelpers
-  attr_accessor :layout, :cards, :custom_colors
-end
-
-module Squib
-  def logger=(l)
-    @logger = l
-  end
-  module_function 'logger='
-end
-
-describe Squib::InputHelpers do
-
-
-  before(:each) do
-    @deck = DummyDeck.new
-    @deck.layout = {
-      'blah' => {x: 25}, 
-      'apples' => {x: 35},
-      'oranges' => {y: 45},
-    }
-    @deck.cards = %w(a b)
-    @deck.custom_colors = {}
-  end
-
-  context '#layoutify' do
-    it "warns on the logger when the layout doesn't exist" do
-      @old_logger = Squib.logger
-      Squib.logger = instance_double(Logger)
-      expect(Squib.logger).to receive(:warn).with("Layout entry 'foo' does not exist.").twice
-      expect(Squib.logger).to receive(:debug)
-      expect(@deck.send(:layoutify, {layout: :foo})).to eq({layout: [:foo,:foo]}) 
-      Squib.logger = @old_logger
-    end
-
-    it "applies the layout in a normal situation" do
-      expect(@deck.send(:layoutify, {layout: :blah})).to \
-        eq({layout: [:blah, :blah], x: [25, 25]}) 
-    end
-
-    it "applies two different layouts for two different situations" do
-      expect(@deck.send(:layoutify, {layout: ['blah', 'apples']})).to \
-        eq({layout: ['blah','apples'], x: [25, 35]}) 
-    end
-
-    it "still has nils when not applied two different layouts differ in structure" do
-      expect(@deck.send(:layoutify, {layout: ['apples', 'oranges']})).to \
-        eq({layout: ['apples','oranges'], x: [35], y: [nil, 45]}) 
-      #...this might behavior that is hard to debug for users. Trying to come up with a warning or something...
-    end
-
-    it "also looks up based on strings" do
-      expect(@deck.send(:layoutify, {layout: 'blah'})).to \
-        eq({layout: ['blah','blah'], x: [25, 25]}) 
-    end
-
-  end
-
-  context '#rangeify' do
-    it "must be within the card size range" do
-      expect{@deck.send(:rangeify, {range: 2..3})}.to \
-        raise_error(ArgumentError, '2..3 is outside of deck range of 0..1')
-    end
-
-    it "cannot be nil" do
-      expect{@deck.send(:rangeify, {range: nil})}.to \
-        raise_error(RuntimeError, 'Range cannot be nil')
-    end
-
-    it "defaults to a range of all cards if :all" do
-      expect(@deck.send(:rangeify, {range: :all})).to eq({range: 0..1})
-    end
-  end
-
-  context "#fileify" do
-    it "should throw an error if the file doesn't exist" do
-      expect{@deck.send(:fileify, {file: 'nonexist.txt'}, true)}.to \
-        raise_error(RuntimeError,"File #{File.expand_path('nonexist.txt')} does not exist!")
-    end
-  end
-
-  context "#dir" do
-    it "should raise an error if the directory does not exist" do
-      expect{@deck.send(:dirify, {dir: 'nonexist'}, :dir, false)}.to \
-        raise_error(RuntimeError,"'nonexist' does not exist!")
-    end
-  end
-
-  context "#colorify" do
-    it "should parse if nillable" do
-      color = @deck.send(:colorify, {color: ['#fff']}, true)[:color]
-      expect(color.to_a[0].to_a).to eq([1.0, 1.0, 1.0, 1.0])
-    end
-
-    it "raises and error if the color doesn't exist" do
-      expect{ @deck.send(:colorify, {color: [:nonexist]}, false) }.to \
-        raise_error(ArgumentError, "unknown color name: nonexist")
-    end
-
-    it "pulls from config's custom colors" do
-      @deck.custom_colors['foo'] = "#abc"
-      expect(@deck.send(:colorify, {color: [:foo]}, false)[:color][0].to_s).to \
-        eq('#AABBCCFF')
-    end
-
-    it "pulls from config's custom colors even when a string" do
-      @deck.custom_colors['foo'] = "#abc"
-      expect(@deck.send(:colorify, {color: ['foo']}, false)[:color][0].to_s).to \
-        eq('#AABBCCFF')
-    end
-  end
-
+require 'spec_helper'
+require 'squib/input_helpers'
+
+class DummyDeck
+  include  Squib::InputHelpers
+  attr_accessor :layout, :cards, :custom_colors
+end
+
+module Squib
+  def logger=(l)
+    @logger = l
+  end
+  module_function 'logger='
+end
+
+describe Squib::InputHelpers do
+
+
+  before(:each) do
+    @deck = DummyDeck.new
+    @deck.layout = {
+      'blah' => {x: 25}, 
+      'apples' => {x: 35},
+      'oranges' => {y: 45},
+    }
+    @deck.cards = %w(a b)
+    @deck.custom_colors = {}
+  end
+
+  context '#layoutify' do
+    it "warns on the logger when the layout doesn't exist" do
+      @old_logger = Squib.logger
+      Squib.logger = instance_double(Logger)
+      expect(Squib.logger).to receive(:warn).with("Layout entry 'foo' does not exist.").twice
+      expect(Squib.logger).to receive(:debug)
+      expect(@deck.send(:layoutify, {layout: :foo})).to eq({layout: [:foo,:foo]}) 
+      Squib.logger = @old_logger
+    end
+
+    it "applies the layout in a normal situation" do
+      expect(@deck.send(:layoutify, {layout: :blah})).to \
+        eq({layout: [:blah, :blah], x: [25, 25]}) 
+    end
+
+    it "applies two different layouts for two different situations" do
+      expect(@deck.send(:layoutify, {layout: ['blah', 'apples']})).to \
+        eq({layout: ['blah','apples'], x: [25, 35]}) 
+    end
+
+    it "still has nils when not applied two different layouts differ in structure" do
+      expect(@deck.send(:layoutify, {layout: ['apples', 'oranges']})).to \
+        eq({layout: ['apples','oranges'], x: [35], y: [nil, 45]}) 
+      #...this might behavior that is hard to debug for users. Trying to come up with a warning or something...
+    end
+
+    it "also looks up based on strings" do
+      expect(@deck.send(:layoutify, {layout: 'blah'})).to \
+        eq({layout: ['blah','blah'], x: [25, 25]}) 
+    end
+
+  end
+
+  context '#rangeify' do
+    it "must be within the card size range" do
+      expect{@deck.send(:rangeify, {range: 2..3})}.to \
+        raise_error(ArgumentError, '2..3 is outside of deck range of 0..1')
+    end
+
+    it "cannot be nil" do
+      expect{@deck.send(:rangeify, {range: nil})}.to \
+        raise_error(RuntimeError, 'Range cannot be nil')
+    end
+
+    it "defaults to a range of all cards if :all" do
+      expect(@deck.send(:rangeify, {range: :all})).to eq({range: 0..1})
+    end
+  end
+
+  context "#fileify" do
+    it "should throw an error if the file doesn't exist" do
+      expect{@deck.send(:fileify, {file: 'nonexist.txt'}, true)}.to \
+        raise_error(RuntimeError,"File #{File.expand_path('nonexist.txt')} does not exist!")
+    end
+  end
+
+  context "#dir" do
+    it "should raise an error if the directory does not exist" do
+      expect{@deck.send(:dirify, {dir: 'nonexist'}, :dir, false)}.to \
+        raise_error(RuntimeError,"'nonexist' does not exist!")
+    end
+  end
+
+  context "#colorify" do
+    it "should parse if nillable" do
+      color = @deck.send(:colorify, {color: ['#fff']}, true)[:color]
+      expect(color.to_a[0].to_a).to eq([1.0, 1.0, 1.0, 1.0])
+    end
+
+    it "raises and error if the color doesn't exist" do
+      expect{ @deck.send(:colorify, {color: [:nonexist]}, false) }.to \
+        raise_error(ArgumentError, "unknown color name: nonexist")
+    end
+
+    it "pulls from config's custom colors" do
+      @deck.custom_colors['foo'] = "#abc"
+      expect(@deck.send(:colorify, {color: [:foo]}, false)[:color][0].to_s).to \
+        eq('#AABBCCFF')
+    end
+
+    it "pulls from config's custom colors even when a string" do
+      @deck.custom_colors['foo'] = "#abc"
+      expect(@deck.send(:colorify, {color: ['foo']}, false)[:color][0].to_s).to \
+        eq('#AABBCCFF')
+    end
+  end
+
 end

data/spec/samples_run_spec.rb

@@ -1,20 +1,20 @@
-require 'spec_helper'
-require 'squib'
-require 'pp'
-
-describe Squib do 
-
-  context "all samples run without error" do
-    it "should execute with no errors" do
-      p = double("ProgressBar")
-      allow(ProgressBar).to receive(:create).and_return(Squib::DoNothing.new)
-      samples = File.expand_path('../samples', File.dirname(__FILE__))
-      Dir["#{samples}/**/*.rb"].each do |sample|
-        Dir.chdir(samples) do #to save to _output
-          require_relative "../samples/#{File.basename(sample)}"
-        end
-      end
-    end
-  end    
-
+require 'spec_helper'
+require 'squib'
+require 'pp'
+
+describe Squib do 
+
+  context "all samples run without error" do
+    it "should execute with no errors" do
+      p = double("ProgressBar")
+      allow(ProgressBar).to receive(:create).and_return(Squib::DoNothing.new)
+      samples = File.expand_path('../samples', File.dirname(__FILE__))
+      Dir["#{samples}/**/*.rb"].each do |sample|
+        Dir.chdir(samples) do #to save to _output
+          require_relative "../samples/#{File.basename(sample)}"
+        end
+      end
+    end
+  end    
+
 end

data/squib.gemspec

@@ -1,46 +1,46 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'squib/version'
-
-Gem::Specification.new do |spec|
-  spec.specification_version = 2 if spec.respond_to? :specification_version=
-  spec.required_rubygems_version = Gem::Requirement.new(">= 0") if spec.respond_to? :required_rubygems_version=
-  spec.rubygems_version = '2.2.2'
-  spec.required_ruby_version = '>= 2.0.0'
-
-  spec.name          = "squib"
-  spec.version       = Squib::VERSION
-  spec.license       = "MIT"
-
-  spec.summary       = %q{A Ruby DSL for prototyping card games}
-  spec.description   = %q{Squib is a Ruby DSL for prototyping card games}
-  spec.authors       = ["Andy Meneely"]
-  spec.email         = ["playconfidencegames@gmail.com"]
-  spec.homepage      = "https://github.com/andymeneely/squib"
-
-  spec.rdoc_options = ["--charset=UTF-8"]
-  spec.extra_rdoc_files = %w[README.md LICENSE.txt]
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency 'cairo', '~> 1.12.9'
-  spec.add_runtime_dependency 'pango', '~> 2.2.0'
-  spec.add_runtime_dependency 'roo', '~> 1.13.2'
-  spec.add_runtime_dependency 'rsvg2', '~> 2.2.0'
-  spec.add_runtime_dependency 'mercenary', '~> 0.3.4'
-  spec.add_runtime_dependency 'ruby-progressbar', '~> 1.5.1'
-
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec-mocks", "~> 3.0"
-  spec.add_development_dependency "redcarpet", '~> 3.1.2'
-  spec.add_development_dependency "github-markup", '~> 1.2.1'
-  spec.add_development_dependency "yard"
-  spec.add_development_dependency "coveralls"
-
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'squib/version'
+
+Gem::Specification.new do |spec|
+  spec.specification_version = 2 if spec.respond_to? :specification_version=
+  spec.required_rubygems_version = Gem::Requirement.new(">= 0") if spec.respond_to? :required_rubygems_version=
+  spec.rubygems_version = '2.2.2'
+  spec.required_ruby_version = '>= 2.0.0'
+
+  spec.name          = "squib"
+  spec.version       = Squib::VERSION
+  spec.license       = "MIT"
+
+  spec.summary       = %q{A Ruby DSL for prototyping card games}
+  spec.description   = %q{Squib is a Ruby DSL for prototyping card games}
+  spec.authors       = ["Andy Meneely"]
+  spec.email         = ["playconfidencegames@gmail.com"]
+  spec.homepage      = "https://github.com/andymeneely/squib"
+
+  spec.rdoc_options = ["--charset=UTF-8"]
+  spec.extra_rdoc_files = %w[README.md LICENSE.txt]
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_runtime_dependency 'cairo', '~> 1.12.9'
+  spec.add_runtime_dependency 'pango', '~> 2.2.0'
+  spec.add_runtime_dependency 'roo', '~> 1.13.2'
+  spec.add_runtime_dependency 'rsvg2', '~> 2.2.0'
+  spec.add_runtime_dependency 'mercenary', '~> 0.3.4'
+  spec.add_runtime_dependency 'ruby-progressbar', '~> 1.6'
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-mocks", "~> 3.0"
+  spec.add_development_dependency "redcarpet", '~> 3.1.2'
+  spec.add_development_dependency "github-markup", '~> 1.3'
+  spec.add_development_dependency "yard"
+  spec.add_development_dependency "coveralls"
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squib
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andy Meneely
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,7 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -255,6 +256,7 @@ files:
 - lib/squib/project_template/layout.yml
 - lib/squib/version.rb
 - samples/_output/gitkeep.txt
+- samples/autoscale_font.rb
 - samples/ball.png
 - samples/basic.rb
 - samples/colors.rb
@@ -282,9 +284,13 @@ files:
 - samples/use_layout.rb
 - spec/api/api_text_spec.rb
 - spec/commands/new_spec.rb
+- spec/data/easy-circular-extends.yml
+- spec/data/hard-circular-extends.yml
 - spec/data/multi-extends-single-entry.yml
 - spec/data/multi-level-extends.yml
 - spec/data/no-extends.yml
+- spec/data/pre-extends.yml
+- spec/data/self-circular-extends.yml
 - spec/data/single-extends.yml
 - spec/data/single-level-multi-extends.yml
 - spec/deck_spec.rb
@@ -313,16 +319,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 2
 summary: A Ruby DSL for prototyping card games
 test_files:
 - spec/api/api_text_spec.rb
 - spec/commands/new_spec.rb
+- spec/data/easy-circular-extends.yml
+- spec/data/hard-circular-extends.yml
 - spec/data/multi-extends-single-entry.yml
 - spec/data/multi-level-extends.yml
 - spec/data/no-extends.yml
+- spec/data/pre-extends.yml
+- spec/data/self-circular-extends.yml
 - spec/data/single-extends.yml
 - spec/data/single-level-multi-extends.yml
 - spec/deck_spec.rb