tlapse 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95f3adbb41bc2f796a89682bce9c9acc2f0ff157b64f76ecaab982bc8d45410c
-  data.tar.gz: f6a341d65c081eea20ea5c6308f5c480cfe30b9a479dfc8ba5393c4a23e63c78
+  metadata.gz: b430e71598aedbebbca7591db61fafc406df196a4f6e052156f45acd570a9775
+  data.tar.gz: 57d8a73fc5d746bed749f51107d7880ea1bdafd67e2175285fa4ad61abc20404
 SHA512:
-  metadata.gz: 2718ee2c921fcf2aed699c76244989b50296f39fe187d057a7243c4933ad44c0e5295fef503749f4da194e3180f6bdf56d3b260de93d3825a97844d74be4c715
-  data.tar.gz: 633b08728398c25eb02c0e595b09ffcbafaff222beccc7d6abef730f0d92ab325a4c01ea542aa3506a5c75f9e9acb234b84f2c85df819261e703cd8606fba8f8
+  metadata.gz: cbe3f73147112a94f2384826d463f0f0b169a6517251919fffc544a0e8b479fe892a154e59e68cdffbf733464c65318a6473bec3f869aad29f8c4918b3b580df
+  data.tar.gz: 241a51427ccd092e73cadbe84b5e6416118a80f3baf2e0cba02213d79a42d59e926c09f2744d020ef5ffb2853ba993c2f001938db3a0647afa1f4039f8eaee4d

data/README.md

@@ -23,7 +23,7 @@ Automated time lapse photography using gphoto2.
 
 Find better documentation by running `tlapse help` or `tlapse help SUBCOMMAND`
 
-* `tlapse capture` - Capture an image using the tethered camera
+* `tlapse capture_single` - Capture an image using the tethered camera
 * `tlapse until_sunset` - Generate a gphoto2 command which captures images until sunset
 
 ## API

data/lib/tlapse/cli/alpha.rb

@@ -1,5 +1,6 @@
 require "thor"
 require "rainbow"
+require "fileutils"
 
 module Tlapse::CLI
   class Alpha < Thor
@@ -58,5 +59,60 @@ module Tlapse::CLI
     def organize
       Tlapse::Util.organize! dry_run: options[:dry_run]
     end
+
+    desc "capture", "Capture a series of timelapse photos"
+    option :interval,
+      desc: "The interval (in minutes) at which pictures will be taken",
+      type: :numeric,
+      default: 5,
+      aliases: %i(i)
+    option :until,
+      desc: %(Time to stop capturing. Can use special "sunset" or "sunrise"),
+      type: :string,
+      default: "sunset"
+    option :compile,
+      desc: "When done capturing, compile photos into a video",
+      type: :boolean,
+      default: false
+    option :compile_out,
+      desc: "Specify the name for the generated video file",
+      type: :string,
+      default: "out.mkv"
+    def capture
+      dirname = Time.now.strftime(Tlapse::Capture.capture_dirname)
+      FileUtils.mkdir_p dirname
+      Dir.chdir dirname
+
+      cmd = Tlapse::Capture.timelapse_command(
+        to: parse_time(options[:until]),
+        interval: options[:interval].minutes
+      )
+
+      if options[:compile]
+        video = Tlapse::Video.new(
+          outfile: options[:compile_out]
+        )
+
+        if video.outfile_exists?
+          Tlapse::Logger.error! "The file #{video.outfile} already exists in" \
+            " the directory #{dirname}. Please delete it or use the" \
+            " --compile-out option to specify a different filename."
+        end
+
+        cmd += " && #{video.create_command}"
+      end
+
+      exec cmd
+    end
+
+    no_commands do
+      def parse_time(time)
+        case time
+        when "sunset" then Tlapse::SolarEvent.sunset
+        when "sunrise" then Tlapse::SolarEvent.sunrise
+        else Time.parse(time)
+        end
+      end
+    end
   end
 end

data/lib/tlapse/cli/cli.rb

@@ -15,8 +15,8 @@ module Tlapse::CLI
       puts Tlapse::VERSION
     end
 
-    desc "capture", "Capture a single photo, saving it to the current directory"
-    def capture
+    desc "capture_single", "Capture a single photo, saving it to the current directory"
+    def capture_single
       Tlapse::Capture.capture_single
     end
 

data/lib/tlapse/version.rb

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

data/lib/tlapse/video.rb

@@ -9,7 +9,7 @@ module Tlapse
       @outfile   = opts.fetch :out,       "out.mkv"
     end
 
-    def create!
+    def create_command
       command = "ffmpeg"
       command += " -pattern_type glob"
       command += " -i '*.jpg'"
@@ -17,8 +17,13 @@ module Tlapse
       command += " -r #{@framerate}"
       command += " -vcodec #{@codec}"
       command += " #{@outfile}"
-      puts command
-      exec command
+      command
+    end
+
+    def create!
+      cmd = create_command
+      puts cmd
+      exec cmd
     end
 
     def outfile_exists?

data/tlapse.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug", "~> 8.2"
   spec.add_development_dependency "timecop", "~> 0.8"
 
-  spec.add_dependency "activesupport", ">= 5.0.0.beta3", "< 5.1"
+  spec.add_dependency "activesupport", "~> 5"
   spec.add_dependency "RubySunrise", "~> 0.3"
   spec.add_dependency "thor", "~> 0.20"
   spec.add_dependency "rainbow", "~> 3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tlapse
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Justin Toniazzo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,22 +84,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: RubySunrise
   requirement: !ruby/object:Gem::Requirement