geminabox-release 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5a43b3911599c364aa4e059815fad3dc21d9be5
-  data.tar.gz: d009b8a270fa930c801996f48563f38855ca7efd
+  metadata.gz: 3ac2fe544ff961eef561fdca7d85519142cd94fb
+  data.tar.gz: 3bc867e5c2831655d7a6e7e9c959cc4e29f5703c
 SHA512:
-  metadata.gz: d657614ff542a9830a3f7f816da6a112c997de11ef2abaecbbb4a70263cf241d2738f30cde52811fec230f018d3c6e980b07c7741b0882398e3dcf27440f00fc
-  data.tar.gz: 78e143b5ac416f9c31e130049b4a66ec90af924b77cfe679c196286d2bf7177820670fe70e80936352f2bd02863858f1375e4f8a81c5038a7f14014383036250
+  metadata.gz: 338ec748c5093a9221c71cf058f6b769214a4e0f4a6ce72059ce1f59919fc9503f166e47470326ade7575c41b39a336df2316ad7eb4b4c627b3f1b2df2aefbde
+  data.tar.gz: abc2274cba3efe41565c7c2cfda0bbb796ce0174cb6a5e0d9ee659179979d39b00b9d1d18b60dbb4c8027271260e20cd9d2fa1f4ae9886414e23fcb493126bb2

data/.gitignore

@@ -1,3 +1,5 @@
 # ide
 .idea/
+pkg/
+Gemfile.lock
 

data/README.md

@@ -16,25 +16,38 @@ You must no longer require "bundler/gem_tasks" as geminabox-release requires a m
 
 ## How to use
 
-Simply load this gem and patch with your geminabox URL in your Rakefile. 
-
-E.g.
+Simply load this gem and patch with your geminabox URL in your Rakefile:
 
 ```ruby
 require 'geminabox-release'
 GeminaboxRelease.patch(:host => "http://localhost:4000")
-
 ```
 
-or use your geminabox config file (YAML file with key :host and host url as value in ~/.gem/geminabox)
+Then you will get a rake `inabox:release` task.
+
+If your server requires basic authentication for the deployment, you can specify `:username` and `:password` as well.
+
+For reasons of compatibility, you can still specify the credentials in the `:host` option (e.g. `http://username:password@localhost:4000`), in which case
+they take precedence over the other parameters.
+
+### Global Defaults
 
+You can store global defaults in `~/.gem/geminabox`, for instance:
+```yaml
+:host: "http://localhost:4000"
+:username: "peter.pan"
+:password: "secret"
+```
+Apply them by passing the `:use_config` flag:
 ```ruby
 require 'geminabox-release'
 GeminaboxRelease.patch(:use_config => true)
 
 ```
 
-Then you will get a rake inabox:release task.
+If an attribute is present in the global configuration, and also passed to the `GeminaboxRelease.patch` call, the latter takes precedence.
+
+### SSL
 
 If your geminabox server is using SSL/TLS, but you have an untrusted certificate, you can use the option `ssl_dont_verify`.
 
@@ -47,6 +60,7 @@ GeminaboxRelease.patch(:host => "https://localhost:4000", :ssl_dont_verify => tr
 
 However, that is _NOT_ recommended.
 
+### Bundler's `release` Task
 
 If you wish to remove the bundler/gem_tasks rake release task, you can by adding `:remove_release` to the patch options:
 
@@ -55,12 +69,8 @@ GeminaboxRelease.patch(:remove_release => true)
 
 ```
 
-
 **Ensure you do not _require "bundler/gem_tasks"_ in your rakefile anymore!**
 
-The gem (theoretically) supports basic auth like geminabox in the host address. e.g. http://username:password@localhost:4000
-It's untested as we didn't need it. Feel free to try it.
-
 
 ### Additional tasks
 
@@ -90,6 +100,8 @@ If the rake tasks do not show make sure you did not require "bundler/gem_tasks"
 
 [Jens Hilligsøe](https://github.com/hilli)
 
+[Frank Schoenheit](https://github.com/frank-schoenheit-red6es)
+
 
 # LICENSE
 

data/lib/geminabox-release.rb

@@ -35,28 +35,49 @@ module GeminaboxRelease
   end
 
   def self.host
-    @host
+    @config[:host]
+  end
+
+  def self.username
+    @config[:username]
+  end
+
+  def self.password
+    @config[:password]
+  end
+
+  def self.ssl_dont_verify
+    @config[:ssl_dont_verify]
+  end
+
+  # extract credentials from a) our options and b) the given URI
+  def self.credentials(uri)
+    username = GeminaboxRelease.username
+    password = GeminaboxRelease.password
+    
+    unless uri.user.nil? || uri.user.empty?
+      username = URI.unescape uri.user
+      password = URI.unescape uri.password
+    end
+    [username, password]
   end
 
   def self.patch(options = {})
     begin
-    if options[:host]
-      @host = options[:host]
-    elsif options[:use_config]
+    attribute_options = [:host, :username, :password, :ssl_dont_verify]
+    @config = {}
+    # read defaults from config file, if requested
+    if options[:use_config]
       require 'yaml'
       raise GeminaboxRelease::NoConfigFile unless File.exist?(File.expand_path("~/.gem/geminabox"))
       data = YAML.load_file(File.expand_path("~/.gem/geminabox"))
-      if data.has_key?(:host)
-        @host = data[:host]
-      else
-        raise GeminaboxRelease::InvalidConfig
-      end
-    else
-      raise GeminaboxRelease::NoHost
-    end
-    if options[:ssl_dont_verify]
-      @ssl_dont_verify = options[:ssl_dont_verify]
+      attribute_options.each { |k| @config[k] = data[k] if data.has_key?(k) }
     end
+    # overwrite defaults with concrete values, if specified
+    @config.merge! options.select { |k,v| attribute_options.include? k }
+
+    # sanity checks
+    raise GeminaboxRelease::NoHost if @config[:host].nil?
 
     Bundler::GemHelper.class_eval do
 
@@ -100,8 +121,9 @@ module GeminaboxRelease
       # pushes to geminabox
       def inabox_push(path, force = false)
         uri = URI.parse(GeminaboxRelease.host)
-        username = uri.user
-        password = uri.password
+
+        username, password = GeminaboxRelease.credentials(uri)
+
         uri.path = uri.path + "/" unless uri.path.end_with?("/")
         uri.path += "upload"
 
@@ -128,7 +150,7 @@ module GeminaboxRelease
         http = Net::HTTP.new(uri.host, uri.port)
         if uri.scheme == 'https'
           http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @ssl_dont_verify
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE if GeminaboxRelease.ssl_dont_verify
         end
         req = Net::HTTP::Post.new(uri.request_uri)
         req.body = post_body.join

data/lib/geminabox-release/version.rb

@@ -3,6 +3,6 @@ module GeminaboxRelease
         # bundler >= 1.0.14 actually is a dependency
 	# Version 0.2.0
 	# * @hilli added support for https with optional veriy_none mode
-	VERSION = "1.0.0"
+	VERSION = "1.1.0"
 end
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: geminabox-release
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Dennis-Florian Herr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.14
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Dependency free rake release task for geminabox
@@ -45,14 +45,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/geminabox-release.rb
-- lib/geminabox-release/version.rb
-- .gitignore
+- ".gitignore"
 - Gemfile
-- geminabox-release.gemspec
+- LICENSE
 - README.md
 - Rakefile
-- LICENSE
+- geminabox-release.gemspec
+- lib/geminabox-release.rb
+- lib/geminabox-release/version.rb
 homepage: 
 licenses:
 - MIT
@@ -63,19 +63,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: see readme
 test_files: []
-has_rdoc: