servedir 0.2 → 0.4

data/COPYING

@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

data/README.md

@@ -14,7 +14,7 @@ to be already configured in the proper way.
 Installation
 ------------
 
-`servedir` do not require installation, it is a single standalone executable
+`servedir` does not require installation, it is a single standalone executable
 script.
 
 However, if desired, it is possible to install `servedir` via RubyGems:
@@ -25,12 +25,18 @@ However, if desired, it is possible to install `servedir` via RubyGems:
 Usage
 -----
 
+Launch `servedir` specifying the directory to be served and the port to be
+used.
+
 On the box behind NAT:
 
-    $ servedir ~/Public 13428
+    $ servedir ~/Public/ 13428
 
+    Discovering addresses and hostnames...
     Server starting... (CTRL-C to terminate)
+
       local address: <http://localhost:13428/>
+      LAN address: <http://fancy-box.local:13428/>
       public address: <http://84.136.123.62:13428/>
 
     [2012-02-11 13:24:01] INFO  WEBrick 1.3.1
@@ -61,7 +67,7 @@ Private files
 -------------
 
 It is possible to block access to private files and also hide them from the
-directory listing. The list of private files must resides a file named
+directory listing. The list of private files must resides in a file named
 `.private` in the served directory; each line must be either a file name or a
 glob pattern.
 
@@ -84,6 +90,7 @@ do not abuse their service.
 License
 -------
 
-This is free and unencumbered software released into the public domain.
-See the `UNLICENSE` file or <http://unlicense.org/> for more details.
+This is free software released into the public domain (CC0 license).
 
+See the `COPYING` file or <http://creativecommons.org/publicdomain/zero/1.0/>
+for more details.

data/bin/servedir

@@ -4,11 +4,15 @@
 # See the `UNLICENSE` file or <http://unlicense.org/> for more details.
 
 require 'open-uri'
+require 'socket'
+require 'timeout'
 require 'webrick'
 
 IP_DISCO_SERVICE = 'http://automation.whatismyip.com/n09230945.asp'
+LAN_IP = '169.254.0.1'
 PRIVATE_LIST_FILE = '.private'
 MAX_PORT = 2**16
+MAX_DISCOVER_WAIT = 4 # seconds
 
 def check_args(dir, port)
 	if !File.directory?(File.expand_path(dir))
@@ -22,18 +26,32 @@ def check_args(dir, port)
 end
 
 def print_addresses(dir, port)
+	puts "Discovering addresses and hostnames..."
+
 	begin
-		ip = open(IP_DISCO_SERVICE).read
-	rescue Errno::ENETUNREACH => err
+		ip = Timeout::timeout(MAX_DISCOVER_WAIT) do
+			open(IP_DISCO_SERVICE).read
+		end
+	rescue
 		puts "WARNING: Cannot reach IP discovery service"
 		ip = "NOT_AVAILABLE"
 	end
 
+	begin
+		lan_ip = UDPSocket.open { |s| s.connect(LAN_IP, 1); s.addr[2] }
+	rescue
+		puts "WARNING: Cannot find LAN-local hostname"
+		lan_ip = "NOT_AVAILABLE"
+	end
+
 	local_uri = "http://localhost:#{port}/"
+	lan_uri = "http://#{lan_ip}:#{port}/"
 	remote_uri = "http://#{ip}:#{port}/"
 
 	puts "Server starting... (CTRL-C to terminate)"
+	puts
 	puts "  local address: <#{local_uri}>"
+	puts "  LAN address: <#{lan_uri}>"
 	puts "  public address: <#{remote_uri}>"
 	puts
 end
@@ -48,7 +66,7 @@ def start_server(dir, port)
 	private_list_file = File.join(dir, PRIVATE_LIST_FILE)
 	if File.exist?(private_list_file)
 		patterns = File.readlines(private_list_file).map(&:strip)
-		ignored_files = patterns
+		ignored_files = patterns.reject(&:empty?).reject { |f| f.start_with?('#') }
 		ignored_files << PRIVATE_LIST_FILE
 		config[:DocumentRootOptions][:NondisclosureName] = ignored_files
 	end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: servedir
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Gioele Barabucci
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-11 00:00:00 Z
+date: 2012-08-23 00:00:00 Z
 dependencies: []
 
 description: 
@@ -29,10 +29,10 @@ extra_rdoc_files: []
 files: 
 - bin/servedir
 - README.md
-- UNLICENSE
-homepage: http://github.com/gioele/servedir
+- COPYING
+homepage: https://github.com/gioele/servedir
 licenses: 
-- UNLICENSE
+- COPYING
 post_install_message: 
 rdoc_options: []
 
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: serve a directory over HTTP from behind NAT

data/UNLICENSE

@@ -1,24 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>