tlapse 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05c79cb1ebafb8041b0bec716670c93a3338f7bd9c7eefdede3bced629797aee
-  data.tar.gz: 5ac5492c545731497b09c717db5a71cf43b902f97d920a34fa9c9fe99de38111
+  metadata.gz: 95f3adbb41bc2f796a89682bce9c9acc2f0ff157b64f76ecaab982bc8d45410c
+  data.tar.gz: f6a341d65c081eea20ea5c6308f5c480cfe30b9a479dfc8ba5393c4a23e63c78
 SHA512:
-  metadata.gz: dbc3c2f6bfc6f6a1581e6c2a4f17e3ef6d9de3f42f017b4c42cbd6ab03236849bbe151c576b5a018c398c5d6b5600e743388ea3a05bfb54d6cdc669e8b9a2c81
-  data.tar.gz: 50630cc133c3b139bb01054817f1f18979ad93211c3545a77d033d02d170eb1e54ebf691c86e85d69c9ccbd19f736b97c824ee841ca4f4d0d6139448d44aa4aa
+  metadata.gz: 2718ee2c921fcf2aed699c76244989b50296f39fe187d057a7243c4933ad44c0e5295fef503749f4da194e3180f6bdf56d3b260de93d3825a97844d74be4c715
+  data.tar.gz: 633b08728398c25eb02c0e595b09ffcbafaff222beccc7d6abef730f0d92ab325a4c01ea542aa3506a5c75f9e9acb234b84f2c85df819261e703cd8606fba8f8

data/lib/tlapse/capture.rb

@@ -4,11 +4,16 @@ module Tlapse
   module Capture
 
     CAPTURE_FILENAME = "%Y-%m-%d_%H-%M-%S.jpg"
+    CAPTURE_DIRNAME  = "%Y-%m-%d"
 
     def self.capture_filename
       CAPTURE_FILENAME
     end
 
+    def self.capture_dirname
+      CAPTURE_DIRNAME
+    end
+
     def self.capture_single
       `gphoto2 --capture-image-and-download --filename '#{capture_filename}'`
     end

data/lib/tlapse/cli/alpha.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "rainbow"
 
 module Tlapse::CLI
   class Alpha < Thor
@@ -41,7 +42,7 @@ module Tlapse::CLI
           FileUtils.rm video.outfile
           puts "Removed file #{video.outfile}"
         else
-          raise "#{video.outfile} exists. Use -f to overwrite or " \
+          Tlapse::Logger.error! "#{video.outfile} exists. Use -f to overwrite or " \
             "-o to specify a different output file."
         end
       end
@@ -49,13 +50,13 @@ module Tlapse::CLI
       video.create!
     end
 
-    desc "normalize", "Cannonically organize pictures in the current directory"
+    desc "organize", "Cannonically organize pictures in the current directory"
     option :dry_run,
       desc: "Print out what would change without actually changing anything",
       type: :boolean,
       default: false
-    def normalize
-      Tlapse::Util.normalize! dry_run: options[:dry_run]
+    def organize
+      Tlapse::Util.organize! dry_run: options[:dry_run]
     end
   end
 end

data/lib/tlapse/logger.rb

@@ -0,0 +1,18 @@
+require "rainbow"
+
+module Tlapse
+  class Logger
+    ERROR_COLOR = :red
+
+    def self.error(message)
+      puts Rainbow(message).fg ERROR_COLOR
+    end
+
+    ##
+    # Print the error message and then exit
+    def self.error!(message, exit_code: 1)
+      error message
+      exit exit_code
+    end
+  end
+end

data/lib/tlapse/util.rb

@@ -2,18 +2,29 @@ require "fileutils"
 
 module Tlapse
   class Util
-    def self.normalize!(dry_run: false)
+    def self.organize!(dry_run: false)
       Dir["*.jpg"].each do |filename|
-        normalized = normalize_filename(filename)
-        if filename != normalized
-          puts "Rename #{filename} to #{normalized}"
-          FileUtils.mv(filename, normalized) unless dry_run
-        end
+        normalize_path! filename, dry_run: dry_run
       end
     end
 
-    def self.normalize_filename(file)
-      File.mtime(file).strftime(Tlapse::Capture::CAPTURE_FILENAME)
+    def self.normalize_path!(file, dry_run: false)
+      dirname = normalized_dirname(file)
+      FileUtils.mkdir dirname unless File.exist? dirname || dry_run
+
+      filename = normalized_filename(file)
+      path = File.join dirname, filename
+
+      puts "Rename #{file} to #{path}"
+      FileUtils.mv file, path unless dry_run
+    end
+
+    def self.normalized_dirname(file)
+      File.mtime(file).strftime(Tlapse::Capture.capture_dirname)
+    end
+
+    def self.normalized_filename(file)
+      File.mtime(file).strftime(Tlapse::Capture.capture_filename)
     end
   end
 end

data/lib/tlapse/version.rb

@@ -1,3 +1,3 @@
 module Tlapse
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/lib/tlapse/video.rb

@@ -21,11 +21,8 @@ module Tlapse
       exec command
     end
 
-    ##
-    # @return whether the output file already exists
     def outfile_exists?
       File.exist? @outfile
     end
-
-  end # Video
-end # Tlapse
+  end
+end

data/lib/tlapse.rb

@@ -5,6 +5,7 @@ require_relative "tlapse/video"
 require_relative "tlapse/server"
 require_relative "tlapse/solar_event"
 require_relative "tlapse/util"
+require_relative "tlapse/logger"
 
 include Tlapse::Doctor
 include Tlapse::Capture

data/tlapse.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 5.0.0.beta3", "< 5.1"
   spec.add_dependency "RubySunrise", "~> 0.3"
   spec.add_dependency "thor", "~> 0.20"
+  spec.add_dependency "rainbow", "~> 3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tlapse
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Justin Toniazzo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: 
 email:
 - jutonz42@gmail.com
@@ -154,6 +168,7 @@ files:
 - lib/tlapse/cli/alpha.rb
 - lib/tlapse/cli/cli.rb
 - lib/tlapse/doctor.rb
+- lib/tlapse/logger.rb
 - lib/tlapse/server.rb
 - lib/tlapse/solar_event.rb
 - lib/tlapse/util.rb