media-runner 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0234ad2c2f19583b5a0c98f95d4d52f61bfe1422
-  data.tar.gz: e79f9f0015b1357e9c946d27a9988b6a376888f5
+  metadata.gz: 640e7450dd33ff8a2508ab3fe70d9879dc5de2b2
+  data.tar.gz: d8463dd431264db98e872ed5edbca742163adb6a
 SHA512:
-  metadata.gz: f7f77c4ad1226eec9d3bb7371c3840d1a7facacba784f9b8879ce6af1e93f520772403d178bc4e5f64b38cec69062a73831dee69d5e0a0f537e146ecff0dbca7
-  data.tar.gz: 6abc7ca7618017af2b60923fcfed70ef4703b6ba8176ac8c7b28cb132f0fb3296e9edfbdcffc6d38410f0845c4e763234a27819faf93760025404e4793c9a0df
+  metadata.gz: df1c86c99af01f13017a542331667ea884afea4bb7af0d2e2ec0f2ed797b27220bccedee35ba8fcc378e12938c0a6a5c347cffce40e2d8fb6ee6e3e6e757f903
+  data.tar.gz: a87674196ef3e944788432d5983c42a707e0c250e6f172b82b2675ab569c78b6b1c04d4dca5f2bda3b3df74010136ed732b5666e1f586091d6e9e15e97a38c4f

data/README.md

@@ -1,6 +1,6 @@
 # Media::Runner
 
-MediaRunner is a simple command line interface for OSX that helps you run your series conveniently in VLC media player.
+MediaRunner is a simple command line interface for OSX that helps you run your series and movies conveniently in VLC media player.
 
 ## Installation
 
@@ -10,7 +10,9 @@ gem install media-runner
 
 ## Usage
 
-Be sure that you have your series stored like this `/Users/#{whoami}/Movies/series/SERIESNAME/EPISODENAME`. 
+Be sure that you have your series stored like this `/Users/#{whoami}/Movies/series/SERIESNAME/EPISODENAME`, and your movies like this `/Users/#{whoami}/Movies/movies/MOVIENAME`.
+
+### Run series
 
 Lets say you have `/Users/#{whoami}/Movies/series/gameofthrones/101.mp4`, then you can run it like this:
 
@@ -18,9 +20,17 @@ Lets say you have `/Users/#{whoami}/Movies/series/gameofthrones/101.mp4`, then y
 media-runner series gameofthrones 101
 ``` 
 
+### Run movie
+
+Lets say you have `/Users/#{whoami}/Movies/movie/thegreatgatsby.mp4`, then you can run it like this:
+
+```
+media-runner movie thegreatgatsby
+``` 
+
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, you can run `bin/check` to run the tests and the code linters. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 

data/lib/media/runner.rb

@@ -2,15 +2,17 @@
 
 require 'media/runner/version'
 require 'rubygems'
+require 'media/runner/printer'
+require 'media/runner/episode'
+require 'media/runner/movie'
 require 'media/runner/app/args_sanitizer'
 require 'media/runner/app/file_check'
 require 'media/runner/app/media_paths'
 require 'media/runner/app/vlc_check'
-require 'media/runner/printer'
 
 module Media
   class Run
-    include ArgsSanitizer, FileCheck, VlcCheck, MediaPaths
+    include ArgsSanitizer
 
     def start
       require 'commander/import'
@@ -23,26 +25,21 @@ module Media
         c.description = 'You can pass the an episode number and a series and run it with VLC.'
         c.example 'Run episode 1 of season 1 of Game of Thrones', 'media-runner series gameofthrones 101'
         c.action do |args|
-          media = sanitize_args(args)
-
-          unless series_exists?(media[:series])
-            Media::Printer.output ["#{series_path(media[:series])} doesn't exist. Did you type the series name \
-                                   correctly?"]
-            exit 1
-          end
-
-          unless episode_exists?(media[:series], media[:episode])
-            Media::Printer.output ["Episode #{media[:episode]} was not found in #{media[:series]}."]
-            exit 1
-          end
-
-          format = episode_format(media[:series], media[:episode])
-          vlc_installed?
+          attributes = sanitize_series_args(args)
+          episode = Episode.new(attributes[:series], attributes[:title])
+          episode.run
+        end
+      end
 
-          Media::Printer.output ["Playing episode #{media[:episode]} from #{media[:series]}. ENJOY!"]
-          `zsh -c "#{Dir.home}/Applications/VLC.app/Contents/MacOS/VLC --fullscreen \
-           #{episode_path(media[:series], media[:episode], format)} > /dev/null 2>&1 &!"`
-          exit 0
+      command :movie do |c|
+        c.syntax = 'media-runner movie MOVIENAME'
+        c.summary = 'run a movie'
+        c.description = 'You can pass the name of a movie and run it with VLC.'
+        c.example 'Run The Great Gatsby', 'media-runner movie thegreatgatsby'
+        c.action do |args|
+          attributes = sanitize_movie_args(args)
+          movie = Movie.new(attributes[:title])
+          movie.run
         end
       end
     end

data/lib/media/runner/app/args_sanitizer.rb

@@ -1,13 +1,24 @@
-require 'media/runner/printer'
-
 module ArgsSanitizer
-  def sanitize_args(args)
+  # Series
+
+  def sanitize_series_args(args)
     if args.count != 2
       Media::Printer.output ['Wrong number of arguments.',
                              'Correct usage: media-runner series SERIES_FOLDER_NAME EPISODE_NUMBER']
       exit 1
     else
-      { series: args[0], episode: args[1] }
+      { series: args[0], title: args[1] }
+    end
+  end
+
+  # Movies
+
+  def sanitize_movie_args(args)
+    if args.count != 1
+      Media::Printer.output ['Wrong number of arguments.', 'Correct usage: media-runner movie MOVIE_NAME']
+      exit 1
+    else
+      { title: args[0] }
     end
   end
 end

data/lib/media/runner/app/file_check.rb

@@ -1,26 +1,29 @@
-require 'media/runner/app/media_paths'
-
 module FileCheck
-  extend MediaPaths
+  # Series
 
-  def series_exists?(series)
-    if File.directory? series_path(series)
+  def series_exists?(episode)
+    if File.directory? series_path(episode)
       true
     else
       false
     end
   end
 
-  def episode_exists?(series, episode)
+  def episode_exists?(episode)
     [:mkv, :mp4, :avi].each do |format|
-      return true if File.file? episode_path(series, episode, format)
+      episode.format = format
+      return true if File.file? episode_path(episode)
     end
     false
   end
 
-  def episode_format(series, episode)
+  # Movies
+
+  def movie_exists?(movie)
     [:mkv, :mp4, :avi].each do |format|
-      return format.to_s if File.file? episode_path(series, episode, format)
+      movie.format = format
+      return true if File.file? movie_path(movie)
     end
+    false
   end
 end

data/lib/media/runner/app/media_paths.rb

@@ -2,25 +2,29 @@ module MediaPaths
   SERIES_BASE = "#{Dir.home}/Movies/series".freeze
   MOVIES_BASE = "#{Dir.home}/Movies/movies".freeze
 
-  def movie_path(movie)
-    nil unless movie
-    "#{MOVIES_BASE}/#{movie}"
-  end
+  # Series
 
-  def series_path(series)
-    nil unless series
-    "#{SERIES_BASE}/#{series}"
+  def series_path(episode)
+    nil unless episode
+    "#{SERIES_BASE}/#{episode.series}"
   end
 
-  def episode_path(series, episode, format)
-    nil unless series && episode && format
-    "#{series_path(series)}/#{episode}.#{format}"
+  def episode_path(episode)
+    nil unless episode
+    "#{series_path(episode)}/#{episode.title}.#{episode.format}"
   end
 
   def series_base
     SERIES_BASE
   end
 
+  # Movies
+
+  def movie_path(movie)
+    nil unless movie
+    "#{MOVIES_BASE}/#{movie.title}.#{movie.format}"
+  end
+
   def movies_base
     MOVIES_BASE
   end

data/lib/media/runner/app/vlc_check.rb

@@ -1,5 +1,3 @@
-require 'media/runner/printer'
-
 module VlcCheck
   def vlc_installed?
     install_vlc unless File.file? "#{Dir.home}/Applications/VLC.app/Contents/MacOS/VLC"

data/lib/media/runner/episode.rb

@@ -0,0 +1,36 @@
+require 'media/runner/app/file_check'
+require 'media/runner/app/media_paths'
+require 'media/runner/app/vlc_check'
+
+module Media
+  class Episode
+    include FileCheck, VlcCheck, MediaPaths
+
+    def initialize(series, title, format = nil)
+      @series = series
+      @title = title
+      @format = format
+    end
+
+    attr_accessor :series, :title, :format
+
+    def run
+      vlc_installed?
+
+      unless series_exists?(self)
+        Media::Printer.output ["#{series_path(self)} doesn't exist. Did you type the series name correctly?"]
+        exit 1
+      end
+
+      unless episode_exists?(self)
+        Media::Printer.output ["Episode #{title} was not found in #{series}."]
+        exit 1
+      end
+
+      Media::Printer.output ["Playing episode #{title} from #{series}. ENJOY!"]
+      `zsh -c "#{Dir.home}/Applications/VLC.app/Contents/MacOS/VLC --fullscreen #{episode_path(self)} > /dev/null \
+       2>&1 &!"`
+      exit 0
+    end
+  end
+end

data/lib/media/runner/movie.rb

@@ -0,0 +1,30 @@
+require 'media/runner/app/file_check'
+require 'media/runner/app/media_paths'
+require 'media/runner/app/vlc_check'
+
+module Media
+  class Movie
+    include FileCheck, VlcCheck, MediaPaths
+
+    def initialize(title, format = nil)
+      @title = title
+      @format = format
+    end
+
+    attr_accessor :title, :format
+
+    def run
+      vlc_installed?
+
+      unless movie_exists?(self)
+        Media::Printer.output ["#{movie_path(self)} doesn't exist. Did you type the movie name correctly?"]
+        exit 1
+      end
+
+      Media::Printer.output ["Playing movie #{title}. ENJOY!"]
+      `zsh -c "#{Dir.home}/Applications/VLC.app/Contents/MacOS/VLC --fullscreen #{movie_path(self)} > /dev/null \
+       2>&1 &!"`
+      exit 0
+    end
+  end
+end

data/lib/media/runner/version.rb

@@ -1,5 +1,5 @@
 module Media
   module Runner
-    VERSION = '1.0.2'.freeze
+    VERSION = '1.0.3'.freeze
   end
 end

data/media-runner.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors = ['Nicolas Eckhart']
   spec.email = ['nicolas.eckhart@renuo.ch']
 
-  spec.summary = 'Simple ruby based command line interface for running movies, music, etc.'
-  spec.description = 'Simple ruby based command line interface for running movies, music, etc.'
+  spec.summary = 'Simple ruby based command line interface for running movies, series, music, etc.'
+  spec.description = 'Simple ruby based command line interface for running movies, series, music, etc.'
   spec.homepage = 'https://www.github.com/nicolaseckhart/media_runner'
   spec.license = 'MIT'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: media-runner
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Nicolas Eckhart
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -94,7 +94,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Simple ruby based command line interface for running movies, music, etc.
+description: Simple ruby based command line interface for running movies, series,
+  music, etc.
 email:
 - nicolas.eckhart@renuo.ch
 executables:
@@ -122,6 +123,8 @@ files:
 - lib/media/runner/app/file_check.rb
 - lib/media/runner/app/media_paths.rb
 - lib/media/runner/app/vlc_check.rb
+- lib/media/runner/episode.rb
+- lib/media/runner/movie.rb
 - lib/media/runner/printer.rb
 - lib/media/runner/version.rb
 - media-runner.gemspec
@@ -148,5 +151,6 @@ rubyforge_project:
 rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
-summary: Simple ruby based command line interface for running movies, music, etc.
+summary: Simple ruby based command line interface for running movies, series, music,
+  etc.
 test_files: []