squib 0.14.2 → 0.14.3.pre1

data/lib/squib/commands/new.rb

@@ -1,77 +1,77 @@
-require 'fileutils'
-
-module Squib
-  # Squib's command-line options
-  module Commands
-
-    # Generate a new Squib project into a fresh directory.
-    #
-    # Provides conventions for using Git (you are using version control, right??).
-    # Also provides some basic layout and config files to start from, along with templates for instructions and other notes you don't want to forget.
-    #
-    #
-    # @example
-    #   squib new foo-blasters
-    #   cd foo-blasters
-    #   ruby deck.rb
-    #   git init
-    #   git add .
-    #   git commit -m "Starting my cool new game using Squib!"
-    #
-    # @api public
-    class New
-
-      # :nodoc:
-      # @api private
-      def process(args, advanced)
-        raise empty_path_error if args.empty?
-
-        new_project_path = File.expand_path(args.join(' '), Dir.pwd)
-
-        FileUtils.mkdir_p new_project_path
-        if !Dir["#{new_project_path}/**/*"].empty?
-          $stderr.puts "#{new_project_path} exists and is not empty. Doing nothing and quitting."
-        else
-          Dir.chdir(new_project_path) do
-            FileUtils.cp_r template_path(advanced) + '/.', new_project_path
-          end
-        end
-        puts "Created basic Squib project in #{new_project_path}."
-        puts advanced_message if advanced
-      end
-
-      def empty_path_error
-        ArgumentError.new('Please specify a path.')
-      end
-
-      def template_path(advanced)
-        path = case advanced
-               when true
-                 '../builtin/projects/advanced'
-               else
-                 '../builtin/projects/basic'
-               end
-        File.expand_path(path, File.dirname(__FILE__))
-      end
-
-      def advanced_message
-        <<-EOS
-
-This is the advanced layout designed for larger games. Everything is
-organized into separate directories and the workflow is all based on
-the Rakefile.
-
-From within this directory, run `bundle install` to install extra
-gems.
-
-After that,  run `rake` to build. Check out the Rakefile for more.
-
-Happy Squibbing! And best of luck with your game.
-  -Andy (@andymeneely)
-
-        EOS
-      end
-
-    end
-  end
-end
+require 'fileutils'
+
+module Squib
+  # Squib's command-line options
+  module Commands
+
+    # Generate a new Squib project into a fresh directory.
+    #
+    # Provides conventions for using Git (you are using version control, right??).
+    # Also provides some basic layout and config files to start from, along with templates for instructions and other notes you don't want to forget.
+    #
+    #
+    # @example
+    #   squib new foo-blasters
+    #   cd foo-blasters
+    #   ruby deck.rb
+    #   git init
+    #   git add .
+    #   git commit -m "Starting my cool new game using Squib!"
+    #
+    # @api public
+    class New
+
+      # :nodoc:
+      # @api private
+      def process(args, advanced)
+        raise empty_path_error if args.empty?
+
+        new_project_path = File.expand_path(args.join(' '), Dir.pwd)
+
+        FileUtils.mkdir_p new_project_path
+        if !Dir["#{new_project_path}/**/*"].empty?
+          $stderr.puts "#{new_project_path} exists and is not empty. Doing nothing and quitting."
+        else
+          Dir.chdir(new_project_path) do
+            FileUtils.cp_r template_path(advanced) + '/.', new_project_path
+          end
+        end
+        puts "Created basic Squib project in #{new_project_path}."
+        puts advanced_message if advanced
+      end
+
+      def empty_path_error
+        ArgumentError.new('Please specify a path.')
+      end
+
+      def template_path(advanced)
+        path = case advanced
+               when true
+                 '../builtin/projects/advanced'
+               else
+                 '../builtin/projects/basic'
+               end
+        File.expand_path(path, File.dirname(__FILE__))
+      end
+
+      def advanced_message
+        <<-EOS
+
+This is the advanced layout designed for larger games. Everything is
+organized into separate directories and the workflow is all based on
+the Rakefile.
+
+From within this directory, run `bundle install` to install extra
+gems.
+
+After that,  run `rake` to build. Check out the Rakefile for more.
+
+Happy Squibbing! And best of luck with your game.
+  -Andy (@andymeneely)
+
+        EOS
+      end
+
+    end
+  end
+end

data/lib/squib/conf.rb

@@ -1,139 +1,144 @@
-require 'forwardable'
-require 'yaml'
-require_relative 'args/typographer'
-
-module Squib
-  USER_CONFIG = {}
-
-  def configure(opts)
-    str_hash = opts.inject({}) { |h, (k, v)| h[k.to_s] = v; h }
-    USER_CONFIG.merge! str_hash
-  end
-  module_function :configure
-
-  # @api private
-  class Conf
-
-    DEFAULTS = {
-      'antialias'     => 'best',
-      'backend'       => 'memory',
-      'count_format'  => '%02d',
-      'custom_colors' => {},
-      'dir'           => '_output',
-      'hint'          => :none,
-      'img_dir'       => '.',
-      'progress_bars' => false,
-      'prefix'        => 'card_',
-      'ldquote'       => "\u201C", # UTF8 chars
-      'rdquote'       => "\u201D",
-      'lsquote'       => "\u2018",
-      'rsquote'       => "\u2019",
-      'em_dash'       => "\u2014",
-      'en_dash'       => "\u2013",
-      'ellipsis'      => "\u2026",
-      'smart_quotes'  => true,
-      'text_hint'     => 'off',
-      'warn_ellipsize' => true,
-      'warn_png_scale' => true,
-    }
-
-    # Translate the hints to the methods.
-    ANTIALIAS_OPTS = {
-      nil        => 'subpixel',
-      'best'     => 'subpixel',
-      'good'     => 'gray',
-      'fast'     => 'gray',
-      'gray'     => 'gray',
-      'subpixel' => 'subpixel'
-    }
-
-    def initialize(config_hash = DEFAULTS)
-      @config_hash = config_hash.merge USER_CONFIG # programmatic overrides yml
-      @typographer = Args::Typographer.new(config_hash)
-      normalize_antialias
-    end
-
-    # Load the configuration file, if exists, overriding hardcoded defaults
-    # @api private
-    def self.load(file)
-      yaml = {}
-      if File.exists? file
-        Squib::logger.info { "  using config: #{file}" }
-        yaml = YAML.load_file(file) || {}
-      end
-      warn_unrecognized(yaml)
-      Conf.new(DEFAULTS.merge(yaml))
-    end
-
-    def to_s
-      "Conf: #{@config_hash.to_s}"
-    end
-
-    def img_dir
-      @config_hash['img_dir']
-    end
-
-    def text_hint
-      @config_hash['text_hint']
-    end
-
-    def text_hint=(hint)
-      @config_hash['text_hint'] = hint
-    end
-
-    def progress_bars
-      @config_hash['progress_bars']
-    end
-
-    def typographer
-      @typographer
-    end
-
-    def dir
-      @config_hash['dir']
-    end
-
-    def prefix
-      @config_hash['prefix']
-    end
-
-    def count_format
-      @config_hash['count_format']
-    end
-
-    def antialias
-      @config_hash['antialias']
-    end
-
-    def backend
-      @config_hash['backend']
-    end
-
-    def custom_colors
-      @config_hash['custom_colors']
-    end
-
-    def warn_ellipsize?
-      @config_hash['warn_ellipsize']
-    end
-
-    def warn_png_scale?
-      @config_hash['warn_png_scale']
-    end
-
-    private
-
-    def normalize_antialias
-      @config_hash['antialias'] = ANTIALIAS_OPTS[@config_hash['antialias'].downcase.strip]
-    end
-
-    # Were there any unrecognized options in the config file?
-    def self.warn_unrecognized(yaml)
-      unrec = yaml.keys - DEFAULTS.keys
-      if unrec.any?
-        Squib::logger.warn "Unrecognized configuration option(s): #{unrec.join(',')}"
-      end
-    end
-
-  end
-end
+require 'forwardable'
+require 'yaml'
+require_relative 'args/typographer'
+
+module Squib
+  USER_CONFIG = {}
+
+  def configure(opts)
+    str_hash = opts.inject({}) { |h, (k, v)| h[k.to_s] = v; h }
+    USER_CONFIG.merge! str_hash
+  end
+  module_function :configure
+
+  # @api private
+  class Conf
+
+    DEFAULTS = {
+      'antialias'     => 'best',
+      'backend'       => 'memory',
+      'count_format'  => '%02d',
+      'custom_colors' => {},
+      'dir'           => '_output',
+      'hint'          => :none,
+      'img_dir'       => '.',
+      'progress_bars' => false,
+      'prefix'        => 'card_',
+      'ldquote'       => "\u201C", # UTF8 chars
+      'rdquote'       => "\u201D",
+      'lsquote'       => "\u2018",
+      'rsquote'       => "\u2019",
+      'em_dash'       => "\u2014",
+      'en_dash'       => "\u2013",
+      'ellipsis'      => "\u2026",
+      'smart_quotes'  => true,
+      'text_hint'     => 'off',
+      'warn_ellipsize' => true,
+      'warn_png_scale' => true,
+      'warn_zero_size_image' => true,
+    }
+
+    # Translate the hints to the methods.
+    ANTIALIAS_OPTS = {
+      nil        => 'subpixel',
+      'best'     => 'subpixel',
+      'good'     => 'gray',
+      'fast'     => 'gray',
+      'gray'     => 'gray',
+      'subpixel' => 'subpixel'
+    }
+
+    def initialize(config_hash = DEFAULTS)
+      @config_hash = config_hash.merge USER_CONFIG # programmatic overrides yml
+      @typographer = Args::Typographer.new(config_hash)
+      normalize_antialias
+    end
+
+    # Load the configuration file, if exists, overriding hardcoded defaults
+    # @api private
+    def self.load(file)
+      yaml = {}
+      if File.exists? file
+        Squib::logger.info { "  using config: #{file}" }
+        yaml = YAML.load_file(file) || {}
+      end
+      warn_unrecognized(yaml)
+      Conf.new(DEFAULTS.merge(yaml))
+    end
+
+    def to_s
+      "Conf: #{@config_hash.to_s}"
+    end
+
+    def img_dir
+      @config_hash['img_dir']
+    end
+
+    def text_hint
+      @config_hash['text_hint']
+    end
+
+    def text_hint=(hint)
+      @config_hash['text_hint'] = hint
+    end
+
+    def progress_bars
+      @config_hash['progress_bars']
+    end
+
+    def typographer
+      @typographer
+    end
+
+    def dir
+      @config_hash['dir']
+    end
+
+    def prefix
+      @config_hash['prefix']
+    end
+
+    def count_format
+      @config_hash['count_format']
+    end
+
+    def antialias
+      @config_hash['antialias']
+    end
+
+    def backend
+      @config_hash['backend']
+    end
+
+    def custom_colors
+      @config_hash['custom_colors']
+    end
+
+    def warn_ellipsize?
+      @config_hash['warn_ellipsize']
+    end
+
+    def warn_png_scale?
+      @config_hash['warn_png_scale']
+    end
+    
+    def warn_zero_size_image?
+      @config_hash['warn_zero_size_image']
+    end
+
+    private
+
+    def normalize_antialias
+      @config_hash['antialias'] = ANTIALIAS_OPTS[@config_hash['antialias'].downcase.strip]
+    end
+
+    # Were there any unrecognized options in the config file?
+    def self.warn_unrecognized(yaml)
+      unrec = yaml.keys - DEFAULTS.keys
+      if unrec.any?
+        Squib::logger.warn "Unrecognized configuration option(s): #{unrec.join(',')}"
+      end
+    end
+
+  end
+end

data/lib/squib/constants.rb

@@ -1,17 +1,17 @@
-module Squib
-
-    # System-wide default font
-    # :nodoc:
-    # @api public
-    DEFAULT_FONT = 'Arial 12'
-
-    # Used for inch-cm conversion
-    # :nodoc:
-    # @api private
-    INCHES_IN_CM = 0.393700787
-
-    # Used for points-inch conversion
-    # :nodoc:
-    # @api private
-    POINTS_PER_IN = 72.0
-end
+module Squib
+
+    # System-wide default font
+    # :nodoc:
+    # @api public
+    DEFAULT_FONT = 'Arial 12'
+
+    # Used for inch-cm conversion
+    # :nodoc:
+    # @api private
+    INCHES_IN_CM = 0.393700787
+
+    # Used for points-inch conversion
+    # :nodoc:
+    # @api private
+    POINTS_PER_IN = 72.0
+end