cyclops 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50d91316768ffce183a6c41be0e4b3b6f89448f2
-  data.tar.gz: acf66a81fe2d13aadfbe59f3b3f47cd3fca1dd23
+  metadata.gz: db466ccb87d28350391ce2adebba44b94dc71e2e
+  data.tar.gz: 4f98b24ed4c00d7f6f024504b5d5ec7f7155d914
 SHA512:
-  metadata.gz: 019744393582f5df8994bd1e4a2e245b8e9e16b71116e8ebc3fc891ea1cd6f066e0b3ae24f934442a069a277062c753238da37f33392a2de584ef4817d00ba38
-  data.tar.gz: 5829be83e1a06d225deb1e9bf5385e3ee1e6010c0f85f35a02ad5e51b471f4ec6df0f4b98e0e17b4907b204006662dc56173e6a37b171bd0c255754d3c4152ca
+  metadata.gz: d552ed05cde6aadea4249bf1ef6f0a8509266dea4a7307157c597159aba2db0ae6da7ba1b89f9a256418ff52fdb3823239c5a73c4ac940ab7120bd9d8db44b90
+  data.tar.gz: d3fad67b9dd9197fba278b4e65961f0b3d4a540cbb9dbceafeeb9dd66a0f28096d23f5c371026ad67b3e7af3fc03cd4b266fd2a7ce084d5655b627627adb7e57

data/ChangeLog

@@ -2,6 +2,11 @@
 
 = Revision history for cyclops
 
+== 0.2.0 [2015-10-02]
+
+* Extracted Cyclops#open_file and Cyclops#open_std from
+  Cyclops#open_file_or_std so they can be overwritten in subclasses.
+
 == 0.1.0 [2014-11-26]
 
 * Extracted Cyclops#config_present? from Cyclops#config_opts so it can be

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to cyclops version 0.1.0
+This documentation refers to cyclops version 0.2.0
 
 
 == DESCRIPTION
@@ -25,7 +25,7 @@ RubyGem::       https://rubygems.org/gems/cyclops
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2014 Jens Wille
+Copyright (C) 2014-2015 Jens Wille
 
 cyclops is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by

data/lib/cyclops.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # cyclops -- A command-line option parser                                     #
 #                                                                             #
-# Copyright (C) 2014 Jens Wille                                               #
+# Copyright (C) 2014-2015 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -95,8 +95,8 @@ class Cyclops
     run(arguments)
   rescue => err
     raise if $VERBOSE
-    abort err.is_a?(OptionParser::ParseError) ?
-      "#{err}\n#{usage}" : "#{err.backtrace.first}: #{err} (#{err.class})"
+    err.is_a?(OptionParser::ParseError) ? quit(err) :
+      abort("#{err.backtrace.first}: #{err} (#{err.class})")
   ensure
     options.each_value { |value| value.close if value.is_a?(Zlib::GzipWriter) }
   end
@@ -166,15 +166,29 @@ class Cyclops
     Kernel.exit(status)
   end
 
-  def open_file_or_std(file, write = false)
-    file == '-' ? write ? stdout : stdin : begin
-      gz = file =~ /\.gz\z/i
+  def open_file_or_std(file, mode = 'r')
+    mode = 'w' if mode == true
+    stdio?(file) ? open_std(file, mode) : open_file(file, mode)
+  end
 
-      write ? gz ? Zlib::GzipWriter.open(file) : File.open(file, 'w') : begin
-        quit "No such file: #{file}" unless File.readable?(file)
-        (gz ? Zlib::GzipReader : File).open(file)
-      end
-    end
+  def open_file(file, mode = 'r')
+    write = write?(mode) or
+      File.readable?(file) or quit "No such file: #{file}"
+
+    file =~ /\.gz\z/i ? (write ? Zlib::GzipWriter :
+      Zlib::GzipReader).open(file) : File.open(file, mode)
+  end
+
+  def open_std(file, mode = nil)
+    write?(mode) ? stdout : stdin
+  end
+
+  def write?(mode)
+    mode == true || mode =~ /w/
+  end
+
+  def stdio?(file)
+    file == '-'
   end
 
   def config_present?(config)

data/lib/cyclops/version.rb

@@ -3,7 +3,7 @@ class Cyclops
   module Version
 
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
 
     class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclops
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -47,7 +47,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,14 +94,14 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  cyclops-0.1.0 [2014-11-26]:
+  cyclops-0.2.0 [2015-10-02]:
 
-  * Extracted Cyclops#config_present? from Cyclops#config_opts so it can be
-    overwritten in subclasses.
+  * Extracted Cyclops#open_file and Cyclops#open_std from
+    Cyclops#open_file_or_std so they can be overwritten in subclasses.
 
 rdoc_options:
 - "--title"
-- cyclops Application documentation (v0.1.0)
+- cyclops Application documentation (v0.2.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A command-line option parser based on optparse.