tlapse 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 095c172778da6f3d7aaf66156127eeac47d0413bbcf888b8288ed2d670024676
-  data.tar.gz: 268453b146950a3bd23935fd1f5f777fb0f3934ea8b1893139f5146de2fca496
+  metadata.gz: 58a891c9f90caa86f4b404d405452349e0e87d0dd75d5a8fc886d5550aedda78
+  data.tar.gz: aebf38a3ea2df2077e05021c17a6adc6bf932f56aca19e9c62ec2712e00d8e56
 SHA512:
-  metadata.gz: f83789b0cd13f58a8be385a8d10d920e5912154d13b699dc1902ba80e5e4e44ea800936b4ccc09e075d785f8f5bee5bf6985afc0b32233503617766f47a26fe7
-  data.tar.gz: 97586ce4a34be667779a17333df117139575ed557c591de9d3f9528f01e73cb3cc26826fa18e88908c31ea0d25932e2460375714606c6b1d92c075d787981b95
+  metadata.gz: 170575a9b7dc5e242b808d49495295457ad7838532f81ea561a9dfb6c94cc9659c1f3b1b9552e69feaf2957b5295fc0b50b987a600a7f0f8cd1d71cfe021bacb
+  data.tar.gz: 9c23386e90c8f3ac2e9ebc87415faa36a74d6448c78e56d301cd1e261fb33613ccf26a3f1d67b11c82cf539e51e148c2d5e8fe1969571d150d1f2e71a70aec18

data/exe/tlapse

@@ -1,91 +1,5 @@
 #!/usr/bin/env ruby
 
-require "gli"
-require "fileutils"
-
-require_relative "../lib/tlapse"
-
-include GLI::App
-include Tlapse
-
-program_desc "Automated time lapse photography via gphoto2"
-version Tlapse::VERSION
-
-desc "Determine whether you are ready to start capturing"
-command :doctor do |c|
-  c.action do |global_options, options, args|
-    doctor
-  end
-end
-
-desc "Capture a single photo, saving it to the current directory"
-command :capture do |c|
-  c.action do |global_options, options, args|
-    Tlapse::Capture.capture_single
-  end
-end
-
-desc "Start a drb server via which photo capturing may be performed remotely"
-command :serve do |c|
-  c.flag :h, :host,
-    desc:          "The hostname on which the server is run",
-    default_value: `hostname`.strip,
-    arg_name:      "host"
-
-  c.flag :p, :port,
-    desc:         "The port on which the server is run",
-    default_value: 9000,
-    arg_name:      "port"
-
-  c.action do |global_options, options, args|
-    server = Tlapse::Server.new(
-      host: options[:host],
-      port: options[:port]
-    )
-    puts "Serving on #{server.full_host}"
-    server.serve
-  end
-end
-
-
-desc "Use ffmpeg to combine all .jpg files in the current directory"
-command :compile do |c|
-  c.switch :f, :force,
-    desc:     "Force overwrite existing output files",
-    negatable: false
-
-  c.flag :o, :out,
-    desc:          "The desired output filename",
-    default_value: "out.mkv",
-    arg_name:      "outfile"
-
-  c.action do |global_options, options, args|
-    video = Video.new options
-
-    if video.outfile_exists?
-      if options[:force]
-        FileUtils.rm video.outfile
-        puts "Removed file #{video.outfile}"
-      else
-        raise "#{video.outfile} exists. Use -f to overwrite or " \
-          "-o to specify a different output file."
-      end
-    end
-    video.create!
-  end
-end
-
-desc "Generate a gphoto2 command which captures photos from now until the sun sets (useful for cronjobs)"
-command :until_sunset do |c|
-  c.flag :i, :interval,
-    desc: "The interval (in minutes) at which pictures will be taken",
-    default_value: "5"
-
-  c.action do |global_options, options, args|
-    interval = options[:interval].to_i.minutes
-    puts Tlapse::Capture.timelapse_command_while_sun_is_up(interval: interval)
-  end
-end
-
-exit run(ARGV)
+require "tlapse/cli/cli"
 
+Tlapse::CLI::CLI.start(ARGV)

data/lib/tlapse/cli/alpha.rb

@@ -0,0 +1,52 @@
+require "thor"
+
+module Tlapse::CLI
+  class Alpha < Thor
+    desc "serve", "Start a drb server via which photo capturing may be performed remotely"
+    option :host,
+      desc: "The hostname on which the server is run",
+      type: :string,
+      default: "localhost",
+      aliases: %i(H)
+    option :port,
+      desc: "The port on which the server is run",
+      type: :numeric,
+      default: 9000,
+      aliases: %i(p)
+    def serve
+      server = Tlapse::Server.new(
+        host: options[:host],
+        port: options[:port]
+      )
+      puts "Serving on #{server.full_host}"
+      server.serve
+    end
+
+    desc "compile", "Use ffmpeg to combine all .jpg files in the current directory"
+    option :force,
+      desc: "Force overwrite any existing output files",
+      type: :boolean,
+      default: false,
+      aliases: %i(f)
+    option :out,
+      desc: "The desired output filename",
+      type: :string,
+      default: "out.mkv",
+      aliases: %i(o)
+    def compile
+      video = Video.new out: options[:out]
+
+      if video.outfile_exists?
+        if options[:force]
+          FileUtils.rm video.outfile
+          puts "Removed file #{video.outfile}"
+        else
+          raise "#{video.outfile} exists. Use -f to overwrite or " \
+            "-o to specify a different output file."
+        end
+      end
+
+      video.create!
+    end
+  end
+end

data/lib/tlapse/cli/cli.rb

@@ -0,0 +1,37 @@
+require "thor"
+require "active_support/core_ext/numeric/time.rb"
+require "tlapse"
+require "tlapse/cli/alpha"
+
+module Tlapse::CLI
+  class CLI < Thor
+    desc "doctor", "Perform checks to see if you're ready to tlapse"
+    def doctor
+      Tlapse::Doctor.doctor
+    end
+
+    desc "version", "Print the version number and exit"
+    def version
+      puts Tlapse::VERSION
+    end
+
+    desc "capture", "Capture a single photo, saving it to the current directory"
+    def capture
+      Tlapse::Capture.capture_single
+    end
+
+    desc "until_sunset", "Generate a gphoto2 command to capture photos from now until the sun sets (useful for cronjobs)"
+    option :interval,
+      desc: "The interval (in minutes) at which picturs will be taken",
+      type: :numeric,
+      default: 5,
+      aliases: %i(i)
+    def until_sunset
+      interval = options[:interval].minutes
+      puts Tlapse::Capture.timelapse_command_while_sun_is_up(interval: interval)
+    end
+
+    desc "alpha", "Get early access to in-development (and likely unstable) commands"
+    subcommand "alpha", Tlapse::CLI::Alpha
+  end
+end

data/lib/tlapse/version.rb

@@ -1,3 +1,3 @@
 module Tlapse
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

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 "gli", "~> 2.13"
   spec.add_dependency "activesupport", ">= 5.0.0.beta3", "< 5.1"
   spec.add_dependency "RubySunrise", "~> 0.3"
+  spec.add_dependency "thor", "~> 0.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tlapse
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Justin Toniazzo
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: gli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
 description: 
 email:
 - jutonz42@gmail.com
@@ -150,6 +150,8 @@ files:
 - exe/tlapse
 - lib/tlapse.rb
 - lib/tlapse/capture.rb
+- lib/tlapse/cli/alpha.rb
+- lib/tlapse/cli/cli.rb
 - lib/tlapse/doctor.rb
 - lib/tlapse/server.rb
 - lib/tlapse/solar_event.rb