halation 0.2.1 → 0.3.0

data/lib/halation/roll.rb

@@ -9,8 +9,12 @@ module Halation
     attr_reader :artist
     # Copyright for the roll of film.
     attr_reader :copyright
-    # Default date for all frames in ISO 8601 format (optional).
-    attr_reader :date
+    # Default date a frame was captured for all frames,
+    # in ISO 8601 format (optional).
+    attr_reader :date_captured
+    # Default date a frame was scanned (digitized) for all frames,
+    # in ISO 8601 format (optional).
+    attr_reader :date_scanned
     # Tag of the cameara used.
     attr_reader :camera
     # Tag of the default lens used (optional).
@@ -28,7 +32,8 @@ module Halation
     def reset
       @artist = nil
       @copyright = nil
-      @date = nil
+      @date_captured = nil
+      @date_scanned = nil
       @camera = nil
       @lens = nil
       @iso = nil
@@ -42,7 +47,8 @@ module Halation
       YAML.load_file(file_path).tap do |roll|
         @artist = Coerce.string(roll["artist"])
         @copyright = Coerce.string(roll["copyright"])
-        @date = Coerce.date(roll["date"])
+        @date_captured = Coerce.date(roll["date_captured"])
+        @date_scanned = Coerce.date(roll["date_scanned"])
         @camera = Coerce.string(roll["camera"])
         @lens = Coerce.string(roll["lens"])
         @iso = Coerce.integer(roll["iso"])

data/lib/halation/roll/frame.rb

@@ -6,8 +6,10 @@ module Halation
     class Frame
       # Frame number.
       attr_reader :number
-      # Date the frame was captured in ISO 8601 format.
-      attr_reader :date
+      # Date the frame was captured, in ISO 8601 format.
+      attr_reader :date_captured
+      # Date the frame was scanned (digitized), in ISO 8601 format.
+      attr_reader :date_scanned
       # Tag of the lens used.
       attr_reader :lens
       # Focal length of the lens, if not specified by the lens profile
@@ -33,7 +35,8 @@ module Halation
 
       def initialize(yaml)
         @number = Coerce.integer(yaml["number"])
-        @date = Coerce.date(yaml["date"])
+        @date_captured = Coerce.date(yaml["date_captured"])
+        @date_scanned = Coerce.date(yaml["date_scanned"])
         @lens = Coerce.string(yaml["lens"])
         @focal_length = Coerce.integer(yaml["focal_length"])
         @shutter = Coerce.string(yaml["shutter"])

data/lib/halation/script.rb

@@ -21,73 +21,78 @@ module Halation
 
       options = {}
 
-      OptionParser.new { |opts|
-        opts.banner = "Usage: halation [options]"
+      OptionParser.new { |op|
+        op.banner = "Usage: halation [options]"
 
-        opts.on("-c", "--config=PATH", String, "Config file path") do |config_path|
+        op.on("-c", "--config=PATH", String, "Config file path") do |config_path|
           options[:config_path] = config_path
         end
 
-        opts.on("--dry", "Dry run") do
+        op.on("--dry", "Dry run") do
           options[:dry_run] = true
           # TODO: Implement
           raise NotImplementedError, "Dry run option is not yet implemented."
         end
 
-        opts.on("-h", "--help", "Print this help") do
-          output_stream.puts opts
+        op.on("-h", "--help", "Print this help") do
+          output_stream.puts op
           run_engine = false
           exit unless skip_exit
         end
 
-        opts.on("--new-config", "Generate a new config file") do |path|
+        op.on("--new-config", "Generate a new config file") do |path|
           # TODO: Implement
           raise NotImplementedError, "Generate config option is not yet implemented."
           run_engine = false
           exit unless skip_exit
         end
 
-        opts.on("--new-roll", "Generate a new roll.yml file") do
-          generate_new_roll
+        op.on("--new-roll", "Generate a new roll.yml file") do
+          generate_new_roll(opts)
           run_engine = false
           exit unless skip_exit
         end
 
-        opts.on("-p", "--print-config", "Print the configuration settings") do
+        op.on("-p", "--print-config", "Print the configuration settings") do
           # TODO: Implement
           raise NotImplementedError, "Print config option is not yet implemented."
           run_engine = false
           exit unless skip_exit
         end
 
-        opts.on("-r", "--recursive", "Traverse into subdirectories") do
+        op.on("-r", "--recursive", "Traverse into subdirectories") do
           # TODO: Implement
           raise NotImplementedError, "Recursive option is not yet implemented."
         end
 
-        opts.on("--silent", "Suppress messages to stdout.") do
+        op.on("--silent", "Suppress messages to stdout.") do
           options[:silent] = true
         end
 
-        opts.on("-v", "--version", "Print the version information") do
+        op.on("-v", "--version", "Print the version information") do
           output_stream.puts "halation #{Halation::VERSION}"
           run_engine = false
           exit unless skip_exit
         end
       }.parse!(args)
-      
+
       Halation::Engine.run(options) if run_engine
     end
 
     # Generate a new roll.yml file.
     # Copies "~/.halation/templates/roll.yml" if it exists, otherwise it uses
     # a default template.
-    def self.generate_new_roll
+    #
+    # @option opts [Boolean] :skip_exit (false)
+    #   Don't exit the program after calling a handler that would normally exit.
+    #   Used for unit testing.
+    def self.generate_new_roll(opts = {})
+      skip_exit = !!opts[:skip_exit]
       roll_path = "roll.yml"
 
       if File.exists?(roll_path)
-        output_stream.puts "A roll.yml file already exists in this directory."
-        return
+        STDERR.puts "A roll.yml file already exists in this directory."
+        exit 1 unless skip_exit
       end
 
       # TODO: Make this configurable from config.yml
@@ -106,9 +111,11 @@ module Halation
 
     # @return [String] roll.yml default content
     def self.new_roll_content
+      today = Time.now.strftime("%Y-%m-%d")
       output = <<YAML
 ---
-date: "2016-01-01"
+date_captured: "#{today}"
+date_scanned: "#{today}"
 camera: "rz67"
 lens: 110
 iso: 100

data/lib/halation/version.rb

@@ -1,4 +1,4 @@
 module Halation
   # Current version of Halation.
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: halation
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex McLain
@@ -92,28 +92,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement