swagger_hub_api_pusher 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e37418a4d0c124179ae99b8b03bc1ff6a0cf46c5
-  data.tar.gz: 43c7d7b6bf3f8261f3701185b42c0cbbd7976eff
+  metadata.gz: e18a807f363126d056e5866772a2dce3b3c07ff2
+  data.tar.gz: abe42036b6fa32a60c383b4b8725c982e76f869e
 SHA512:
-  metadata.gz: c5ad856465360d4717d1fd733e85a025885273de51d6a85f6feb9bb769e3aefc387c18cc15e4e03f0a5733aceaa6f6bc2a019e8cbf9cc08b69a42237c91384b0
-  data.tar.gz: 939bd0e4fe8471e68eed3dc7947f03920f6da363e769f81f82167fa5a583e7664a0a58882cafaf899962e6245ad94cc21c3d55d28beed608d88e9e9e1d5a5ccf
+  metadata.gz: 1e0df65508e8210c213804fe3970553eb8a60b6de226672bf199f073e47cf56872333404a89ac64119c2f459124a2162a4f9f15e2661c625e528304e619ccc52
+  data.tar.gz: 362979324edb51ffcb62843e7c0bf072e303bb36dbf1eaf38a5ee3b4a28294c488d4e79fd4df6b73bfdc043cec7c724282dad5125f09802274bd106c34fc9637

data/lib/swagger_hub_api_pusher/pusher.rb

@@ -1,33 +1,76 @@
 require 'uri'
 require 'net/https'
+require 'json'
 
 module SwaggerHubApiPusher
   class Pusher
     SUCCESS_STATUSES = [200, 201].freeze
     BASE_URL = 'https://api.swaggerhub.com/apis'.freeze
+    VERSION_REGEX = /(\d+\.)?(\d+\.)?(\*|\d+)/
 
     def execute
       raise ArgumentError, config.errors_messages unless config.valid?
 
-      uri = URI.parse(url)
-      request = Net::HTTP::Post.new(uri)
-      request['Content-Type'] = 'application/json'
-      request['Authorization'] = config.api_key
-      request.body = File.read(config.swagger_file)
+      return if published_api_is_actual?
 
-      response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-        http.request(request)
-      end
+      response = push_swagger_file
 
       unless SUCCESS_STATUSES.include?(response.code.to_i)
         JSON.parse(response.body)['message']
       end
     end
 
-    private def url
+    private def published_api_is_actual?
+      response = perform_request Net::HTTP::Get, get_api_url
+      return unless SUCCESS_STATUSES.include?(response.code.to_i)
+
+      apis = JSON.parse(response.body)['apis']
+      last_published_api = apis.reverse.find do |api|
+        api['properties'].find do |pr|
+          pr['type'] == 'X-Published' && pr['value'] == 'true'
+        end
+      end
+      return unless last_published_api
+
+      last_published_version = last_published_api['properties'].find { |pr| pr['type'] == 'X-Version' }['value']
+      version(config.version) <= version(last_published_version)
+    end
+
+    private def version(version_str)
+      matched = VERSION_REGEX.match(version_str)
+      Gem::Version.new(matched ? matched[0] : nil)
+    end
+
+    private def push_swagger_file
+      perform_request Net::HTTP::Post, post_api_url, swagger_file
+    end
+
+    private def perform_request(request_class, url, body = nil)
+      uri = URI.parse(url)
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+
+      request = request_class.new(uri.request_uri)
+      request['Content-Type'] = 'application/json'
+      request['Authorization'] = config.api_key
+      request.body = body unless body.nil?
+
+      http.request(request)
+    end
+
+    private def get_api_url
+      "#{BASE_URL}/#{config.owner}/#{config.api_name}"
+    end
+
+    private def post_api_url
       "#{BASE_URL}/#{config.owner}/#{config.api_name}?version=#{config.version}"
     end
 
+    private def swagger_file
+      @swagger_file ||= File.read(config.swagger_file)
+    end
+
     private def config
       @config ||= SwaggerHubApiPusher.config
     end

data/lib/swagger_hub_api_pusher/version.rb

@@ -1,3 +1,3 @@
 module SwaggerHubApiPusher
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/tasks/swagger.rake

@@ -5,6 +5,6 @@ namespace :swagger do
   desc 'Push swagger json to SwaggerHub API'
   task push: :environment do
     response = SwaggerHubApiPusher::Pusher.new.execute
-    puts response unless response.nil?
+    abort response unless response.nil?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagger_hub_api_pusher
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Markov Alexey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler