ompload 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,6 +1,14 @@
+# 1.0.2
+  - c4cfe0f Bump version.
+  - 40a6c36 Add version flag.
+  - 07e9166 Add copyright.
+  - 6e27854 Decrease max file size to 1GiB.
+  - 88feafc Correct stdin size limitation.
+
 # 1.0.1
-    pick bffc337 Version bump.
-    pick 9e0d8d6 Better README and usage.
-    pick 06ff5d3 Update github username.
+  - bffc337 Version bump.
+  - 9e0d8d6 Better README and usage.
+  - 06ff5d3 Update github username.
+
 # 1.0.0
-    Initial release.
+  - Initial release.

data/LICENSE

@@ -1,4 +1,6 @@
-Copyright (C) 2011 Murilo Pereira <murilo@murilopereira.com>
+Copyright (C) 2007-2012 David Shakaryan <omp@gentoo.org>
+Copyright (C) 2007-2012 Brenden Matthews <brenden@diddyinc.com>
+Copyright (C) 2010-2012 Murilo Pereira <murilo@murilopereira.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/bin/ompload

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 #
-# Copyright 2010-2011 Murilo Pereira <murilo@murilopereira.com>
+# Copyright 2007-2012 David Shakaryan <omp@gentoo.org>
+# Copyright 2007-2012 Brenden Matthews <brenden@diddyinc.com>
+# Copyright 2010-2012 Murilo Pereira <murilo@murilopereira.com>
+#
 # Distributed under the terms of the GNU General Public License v3
 #
 
@@ -11,6 +14,7 @@ opts = GetoptLong.new(['--help',     '-h', GetoptLong::NO_ARGUMENT],
                       ['--filename', '-f', GetoptLong::REQUIRED_ARGUMENT],
                       ['--quiet',    '-q', GetoptLong::NO_ARGUMENT],
                       ['--url',      '-u', GetoptLong::NO_ARGUMENT],
+                      ['--version',  '-v', GetoptLong::NO_ARGUMENT],
                       ['--no-clip',  '-n', GetoptLong::NO_ARGUMENT])
 
 options = { :clip => true }
@@ -27,6 +31,8 @@ opts.each do |opt, arg|
     options[:url] = true
   when '--no-clip'
     options[:clip] = false
+  when '--version'
+    options[:version] = true
   end
 end
 

data/lib/ompload.rb

@@ -55,8 +55,8 @@ module Omploader
 end
 
 module Ompload
-  VERSION = '1.0.1'
-  MAX_FILE_SIZE = 2**32
+  VERSION = '1.0.2'
+  MAX_FILE_SIZE = 2**20
 
   USAGE = <<-USAGE.gsub(/^    /, '')
     Usage: ompload [-h|--help] [options] [file(s)]
@@ -64,6 +64,7 @@ module Ompload
       -u, --url       Only output URLs
       -f, --filename  File name on omploader for when piping data via stdin
       -n, --no-clip   Disable copying of the URL to the clipboard
+      -v, --version   Show version
 
       You can supply a list of files or data via stdin (or both)
   USAGE
@@ -94,9 +95,9 @@ module Ompload
       "error: '#{file_path}' does not exist or is not a regular file"
     end
 
-    def file_too_big(file_path)
+    def payload_too_big(file_path, file_size)
       "error: '#{file_path}' exceeds #{MAX_FILE_SIZE} bytes " <<
-      "(size is #{File.size(file_path)})."
+      "(size is #{file_size})."
     end
   end
 
@@ -119,7 +120,7 @@ module Ompload
           STDERR.puts Message.invalid_file(file_path)
           ErrorCounter.instance.increment!
         elsif File.size(file_path) > MAX_FILE_SIZE
-          STDERR.puts Message.file_too_big(file_path)
+          STDERR.puts Message.payload_too_big(file_path,File.size(file_path))
           ErrorCounter.instance.increment!
         else
           handle_file(file_path, options)
@@ -129,11 +130,16 @@ module Ompload
 
     def handle_data(data, options = {})
       file_name = options[:file_name] || 'piped data'
-      puts Message.progress(file_name) if !options[:quiet] && !options[:url]
-      response = upload_with_curl({ :data => data,
-                                    :file_name => file_name,
-                                    :silent => options[:quiet] || options[:url] })
-      handle_response!(response, file_name, options)
+      if data.bytesize > MAX_FILE_SIZE
+          STDERR.puts Message.payload_too_big(file_name, data.bytesize)
+          ErrorCounter.instance.increment!
+      else
+          puts Message.progress(file_name) if !options[:quiet] && !options[:url]
+          response = upload_with_curl({ :data => data,
+                                      :file_name => file_name,
+                                      :silent => options[:quiet] || options[:url] })
+          handle_response!(response, file_name, options)
+      end
     rescue ThrottledError
       STDERR.puts Message.throttled(file_name)
       sleep(60) and retry
@@ -181,10 +187,15 @@ module Ompload
         abort('error: curl missing or not in path. Cannot continue.')
       end
 
+      if options[:version]
+        puts VERSION
+        exit
+      end
+
       abort(USAGE) if ARGV.size < 1 && !piped_data_given? || options[:help]
 
       UploadsHandler.handle_files(ARGV, options)
-      UploadsHandler.handle_data(STDIN.read(4096), options) if piped_data_given?
+      UploadsHandler.handle_data(STDIN.read(), options) if piped_data_given?
 
       if xclip_installed? && options[:clip] && !XclipBuffer.instance.content.empty?
         IO.popen('xclip', 'w+').puts XclipBuffer.instance.content

metadata

@@ -1,28 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ompload
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.2
   prerelease: 
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Murilo Pereira
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-26 00:00:00 -03:00
-default_executable: 
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: murilo@murilopereira.com
-executables: 
+executables:
 - ompload
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.md
 - LICENSE
@@ -30,33 +25,28 @@ files:
 - bin/ompload
 - lib/ompload.rb
 - ompload.gemspec
-has_rdoc: true
 homepage: https://github.com/mpereira/ompload
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - .
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Upload files to omploader.
 test_files: []
-