aptly-api 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 626177bba4926b1d4edfe1229e5e334238cf61b4
-  data.tar.gz: 077010652f6d2059f85e647f89913ddbfcd23daa
+  metadata.gz: 4780f4046bb039881a21ccaf84875a3a1ace1b13
+  data.tar.gz: 930424d21df245e34f9748995bba0b54422b924e
 SHA512:
-  metadata.gz: c9d07b75e5ba858305bf41f4e274db6c22a5a00f7f404dfd32b746cd5e91ae3abe41f20199a37481f3540f68091f9a10c65360dd16734a793495ff6e5d0d4b28
-  data.tar.gz: 9feb9b78522009ffbc8d980835d6a2b8165157cbf9e3c697ea5f6ec732a97e0d7e22c52918b052fa1b36b90084e8fa4eb33d564be80118243f206dc8fe7d9347
+  metadata.gz: cbe5dc685508f22ec9bd6fbe4d9557ebd2fbcf4e12e43a7eb6c5cd04e85f80b7f62ef2194a1c2ece5507a6621dfa9179adeee9fcf034882dd6fdf59486d23298
+  data.tar.gz: ee604d080ccb11341dd95bac7b43cd9c25686d9bb640e80772e80e4442a3b1c1d02101090cdfba731b76d1ce3a0714e7d34508be6028d2bc9826dc44e853d02a

data/.rubocop.yml

@@ -0,0 +1,3 @@
+AllCops:
+  TargetRubyVersion: 2.1
+

data/aptly-api.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'rake-notes', '~> 0.2'
   spec.add_development_dependency 'simplecov', '~> 0.11'
-  spec.add_development_dependency 'webmock', '~> 1.22'
+  spec.add_development_dependency 'webmock', '~> 2.1'
   spec.add_development_dependency 'yard', '~> 0.8'
 
   spec.add_dependency 'faraday', '~> 0.9'

data/lib/aptly/connection.rb

@@ -26,7 +26,7 @@ module Aptly
       @query = kwords.fetch(:query, DEFAULT_QUERY)
 
       uri = ::Aptly.configuration.uri
-      @connection = Faraday.new(url: uri.to_s) do |c|
+      @connection = Faraday.new(uri.to_s) do |c|
         c.request :multipart
         c.request :url_encoded
         c.adapter :net_http

data/lib/aptly/errors.rb

@@ -19,6 +19,9 @@ module Aptly
     # Raised when a request returns code 500.
     class ServerError < HTTPError; end
 
+    # Raised when a Snapshot consists of a unknown source type
+    class UnknownSourceTypeError < StandardError; end
+
     # Raised when a file operation had an error.
     class RepositoryFileError < StandardError
       # @!attribute [r] failures

data/lib/aptly/publish.rb

@@ -8,7 +8,7 @@ module Aptly
   class PublishedRepository < Representation
     def initialize(*args)
       super(*args)
-      self.Sources.collect! { |s| Repository.new(connection, s) }
+      parse_sources
     end
 
     # Drops a published repository. This removes the published repository
@@ -51,5 +51,18 @@ module Aptly
     def api_prefix
       self.Prefix.tr('_', '__').tr('/', '_')
     end
+
+    def parse_sources
+      self.Sources.collect! do |s|
+        case self.SourceKind
+        when 'local'
+          Repository.new(connection, s)
+        when 'snapshot'
+          Snapshot.new(connection, s)
+        else
+          raise Aptly::Errors::UnknownSourceTypeError
+        end
+      end
+    end
   end
 end

data/lib/aptly/publishable.rb

@@ -0,0 +1,26 @@
+module Aptly
+  module Publishable
+    # Lists all PublishedRepositories self is published in. Namely self must
+    # be a source of the published repository in order for it to appear here.
+    # This method always returns an array of affected published repositories.
+    # If you use this method with a block it will additionally yield each
+    # published repository that would appear in the array, making it a shorthand
+    # for {Array#each}.
+    # @yieldparam pub [PublishedRepository]
+    # @return [Array<PublishedRepository>]
+    def published_in
+      Aptly::PublishedRepository.list(connection).select do |pub|
+        next false unless pub.Sources.any? do |src|
+          src.Name == self.Name
+        end
+        yield pub if block_given?
+        true
+      end
+    end
+
+    # @return [Boolean]
+    def published?
+      !published_in.empty?
+    end
+  end
+end

data/lib/aptly/repository.rb

@@ -4,11 +4,14 @@ require 'tmpdir'
 require_relative 'errors'
 require_relative 'representation'
 require_relative 'snapshot'
+require_relative 'publishable'
 
 module Aptly
   # Aptly repository representation.
   # @see http://www.aptly.info/doc/api/repos/
   class Repository < Representation
+    include Publishable
+
     # Delete this repository.
     def delete(**kwords)
       connection.send(:delete, "/repos/#{self.Name}", query: kwords)
@@ -78,29 +81,6 @@ module Aptly
       Aptly.publish([{ Name: self.Name }], prefix, 'local', kwords)
     end
 
-    # @return [Boolean]
-    def published?
-      !published_in.empty?
-    end
-
-    # Lists all PublishedRepositories self is published in. Namely self must
-    # be a source of the published repository in order for it to appear here.
-    # This method always returns an array of affected published repositories.
-    # If you use this method with a block it will additionally yield each
-    # published repository that would appear in the array, making it a shorthand
-    # for {Array#each}.
-    # @yieldparam pub [PublishedRepository]
-    # @return [Array<PublishedRepository>]
-    def published_in
-      Aptly::PublishedRepository.list(connection).select do |pub|
-        next false unless pub.Sources.any? do |src|
-          src.Name == self.Name
-        end
-        yield pub if block_given?
-        true
-      end
-    end
-
     # Edit this repository's attributes as per the parameters.
     # @note this possibly mutates the attributes depending on the HTTP response
     # @return [self] if the instance data was mutated
@@ -116,9 +96,16 @@ module Aptly
     end
 
     # Creates a new {Snapshot}
+    # @param name [String] name of snapshot
     # @return {Snapshot} newly created instance
-    def snapshot(**kwords)
-      kwords = kwords.map { |k, v| [k.to_s.capitalize, v] }.to_h
+    def snapshot(name = nil, **kwords)
+      # TODO: 1.0
+      if name.nil? && !kwords.key?(:Name)
+        # backwards compatible handling allows name to be passed though
+        # kwords or the argument. Argument is preferred.
+        raise ArgumentError, 'wrong number of arguments (given 0, expected 1)'
+      end
+      kwords[:Name] = name unless name.nil?
       response = connection.send(:post, "/repos/#{self.Name}/snapshots",
                                  body: JSON.generate(kwords))
       Aptly::Snapshot.new(::Aptly::Connection.new, JSON.parse(response.body))

data/lib/aptly/snapshot.rb

@@ -1,9 +1,12 @@
 require_relative 'representation'
+require_relative 'publishable'
 
 module Aptly
   # Aptly snapshots representation.
   # @see http://www.aptly.info/doc/api/snapshots/
   class Snapshot < Representation
+    include Publishable
+
     # Updates this snapshot
     # @return [self] if the instance data was mutated
     # @return [nil] if the instance data was not mutated
@@ -50,7 +53,6 @@ module Aptly
       Aptly.publish([{ Name: self.Name }], prefix, 'snapshot', kwords)
     end
 
-
     class << self
       # List all known snapshots.
       # @param connection [Connection] connection to use for the instance

data/lib/aptly/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptly-api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Harald Sitter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - COPYING.lib
@@ -160,6 +161,7 @@ files:
 - lib/aptly/errors.rb
 - lib/aptly/files.rb
 - lib/aptly/publish.rb
+- lib/aptly/publishable.rb
 - lib/aptly/repository.rb
 - lib/aptly/representation.rb
 - lib/aptly/snapshot.rb