aptly-api 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ad1e37dd7595391142d77328208cd96f2b57aa1
-  data.tar.gz: 6d7901b8f560056366b7cdf8c6a58d054ced4345
+  metadata.gz: f4366fc69e420aae0067501a98a0cc13de7e78b9
+  data.tar.gz: 34924e0d41b9f8c7779e7bd00aa63ae670acde88
 SHA512:
-  metadata.gz: 4c4943d6505487279027b4fa866018bba678f4768f456d20877a9fa5ed767fddc3bf8c52e1d0c5f456bb5674ed9bb7ef32e78f8857686f9afafbe2391c0106b3
-  data.tar.gz: a510b670bf6afde990e3373bc98b2375f93414ae2ea6b074181724f01cbecad364236a84a904cb33d4a9e0d5af4174a4ecdfa85c203d98b1ce0643dc31bdef41
+  metadata.gz: cd772f0145fef0826037da2b127d4c661aa939bde965355ae17626fccda320cd34e590819f0c7646d88ab2c6a002e97fbd3792b74159520b6b71bb6492ef8067
+  data.tar.gz: 262cb466331fdd8c08992174c8827604d2b0d26265de412927128e17059b11a5307120ab9676251e2af5c13e557432c364877dc57ac884a00cb05f9ac1c32aa5

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
   - 2.2.1
+  - 2.3.0
 before_install: gem install bundler -v 1.10.6

data/README.md

@@ -28,8 +28,7 @@ Or install it yourself as:
 require 'aptly'
 
 Aptly.configure do |config|
-  config.host = 'localhost'
-  config.port = 8080
+  config.uri = URI::HTTP.build(host: 'localhost', port: 8080)
 end
 
 repo = Aptly::Repository.create('kewl-new-repo')
@@ -40,6 +39,9 @@ end
 repo.publish('public-name', Distribution: 'wily', Architectures: %w(amd64 i386))
 ```
 
+## Documentation
+http://www.rubydoc.info/gems/aptly-api/Aptly/
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/aptly/configuration.rb

@@ -1,36 +1,63 @@
+require 'rubygems/deprecate'
+
 module Aptly
   # Configuration.
   class Configuration
+    extend Gem::Deprecate
+
+    # @!attribute uri
+    #   @return [URI] the base URI for the API (http://localhost by default)
+    attr_accessor :uri
+
+    # Creates a new instance.
+    # @param uri see {#uri}
+    # @param host DEPRECATED use uri
+    # @param port DEPRECATED use uri
+    # @param path DEPRECATED use uri
+    def initialize(uri: URI::HTTP.build(host: 'localhost',
+                                        port: 80,
+                                        path: '/'),
+                   host: nil, port: nil, path: nil)
+      @uri = uri unless host || port || path
+      return if @uri
+      @uri = fallback_uri(host, port, path)
+    end
+
     # @!attribute host
+    #   @deprecated use {#uri}
     #   @return [String] host name to talk to
-    attr_accessor :host
 
     # @!attribute port
+    #   @deprecated use {#uri}
     #   @return [Integer] port to talk to host to on
-    attr_accessor :port
 
     # @!attribute path
+    #   @deprecated use {#uri}
     #   @return [String] path to use (defaults to /)
-    attr_accessor :path
 
-    # Creates a new instance.
-    # @param host see {#host}
-    # @param port see {#port}
-    def initialize(host: 'localhost', port: 80, path: '/')
-      @host = host
-      @port = port
-      @path = path
+    # Fake deprecated attributes and redirect them to @uri
+    [:host, :port, :path].each do |uri_attr|
+      define_method(uri_attr.to_s) do
+        @uri.send(uri_attr)
+      end
+      deprecate uri_attr, :uri, 2017, 1
+      define_method("#{uri_attr}=") do |x|
+        # Ruby < 2.3 does not manage to handle string ports, so we need
+        # to manually convert to integer.
+        @uri.send("#{uri_attr}=", uri_attr == :port ? safe_port(x) : x)
+      end
+      deprecate "#{uri_attr}=".to_sym, :uri, 2017, 1
+    end
+
+    private
+
+    def safe_port(port)
+      port ? port.to_i : port
     end
 
-    def uri
-      # FIXME: maybe we should simply configure a URI instead of configuring
-      #   each part?
-      uri = URI.parse('')
-      uri.scheme = 'http'
-      uri.host = host
-      uri.port = port
-      uri.path = path
-      uri
+    def fallback_uri(host, port, path)
+      URI::HTTP.build(host: host || 'localhost', port: safe_port(port || 80),
+                      path: path || '/')
     end
   end
 end

data/lib/aptly/version.rb

@@ -1,4 +1,4 @@
 # Aptly API
 module Aptly
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aptly-api
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Harald Sitter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler