From dfb2bf0dab5cd1ce28bd35ae64530f515f75d99d Mon Sep 17 00:00:00 2001 From: jackorp Date: Thu, 5 Apr 2018 20:42:28 +0200 Subject: [PATCH 1/4] Bump epoch to make package buildable * While updating I didn't realise it does not have the packages needed in f28, this fixes my mistake. --- rubygem-em-websocket.spec | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/rubygem-em-websocket.spec b/rubygem-em-websocket.spec index 3091d80..2610091 100644 --- a/rubygem-em-websocket.spec +++ b/rubygem-em-websocket.spec @@ -3,23 +3,16 @@ Name: rubygem-%{gem_name} Version: 0.5.1 -Release: 22%{?dist} +Release: 1%{?dist} +Epoch: 1 Summary: EventMachine based WebSocket server License: MIT URL: http://github.com/igrigorik/em-websocket Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -# Test suite depends on specific version of em-websocket-client -# that isn't pushed into master branch: -# https://github.com/igrigorik/em-websocket/blob/master/Gemfile#L5 -# Luckily, the package is actually just one small file: -# https://github.com/movitto/em-websocket-client/blob/expose-websocket-api/lib/em-websocket-client.rb -Source1: https://raw.githubusercontent.com/movitto/em-websocket-client/expose-websocket-api/lib/em-websocket-client.rb BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby BuildRequires: rubygem(rspec) -BuildRequires: rubygem(em-http-request) -BuildRequires: rubygem(em-websocket-client) BuildRequires: rubygem(em-spec) BuildRequires: rubygem(http_parser.rb) BuildArch: noarch @@ -30,7 +23,7 @@ EventMachine based WebSocket server. %package doc Summary: Documentation for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} BuildArch: noarch %description doc @@ -60,7 +53,14 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} -rspec -I %{dirname:%{SOURCE1}} spec +# we do not have packages needed for tests in fedora +sed -i '/em-http/ s/^/#/' spec/helper.rb +sed -i '/em-websocket-client/ s/^/#/' spec/helper.rb + +mv spec/integration/common_spec.rb{,.bak} +mv spec/integration/draft75_spec.rb{,.bak} + +rspec spec popd %files @@ -81,8 +81,11 @@ popd %{gem_instdir}/spec %changelog -* Wed Jan 24 2018 Jaroslav Prokop - 0.5.1-2 -- Enable test suites after needed packages were imported to Fedora. +* Thu Apr 5 2018 Jaroslav Prokop - 1:0.5.1-1 +- The package does not have packages needed for tests in f28 + +* Thu Apr 5 2018 Jaroslav Prokop - 0.5.1-2 +- Enable test suites after needed packages were imported to Fedora. * Wed Jan 24 2018 Jaroslav Prokop - 0.5.1-1 - Initial package From 05b2d9005b2c41a825f51667050cfe5e37fe2cc6 Mon Sep 17 00:00:00 2001 From: jackorp Date: Fri, 11 May 2018 18:54:39 +0200 Subject: [PATCH 2/4] Delete unneeded file --- em-websocket-client.rb | 67 ------------------------------------------ 1 file changed, 67 deletions(-) delete mode 100644 em-websocket-client.rb diff --git a/em-websocket-client.rb b/em-websocket-client.rb deleted file mode 100644 index e63b217..0000000 --- a/em-websocket-client.rb +++ /dev/null @@ -1,67 +0,0 @@ -require 'eventmachine' -require 'uri' -require 'websocket' - -module EventMachine - class WebSocketClient < Connection - include Deferrable - - attr_accessor :url - attr_accessor :protocol_version - attr_accessor :origin - - def self.connect(uri, opts={}) - p_uri = URI.parse(uri) - conn = EM.connect(p_uri.host, p_uri.port || 80, self) do |c| - c.url = uri - c.protocol_version = opts[:version] - c.origin = opts[:origin] - end - end - - def post_init - @handshaked = false - @frame = ::WebSocket::Frame::Incoming::Client.new - end - - def connection_completed - @connect.yield if @connect - @hs = ::WebSocket::Handshake::Client.new(:url => @url, - :origin => @origin, - :version => @protocol_version) - send_data @hs.to_s - end - - def stream &cb; @stream = cb; end - def connected &cb; @connect = cb; end - def disconnect &cb; @disconnect = cb; end - - def receive_data data - if !@handshaked - @hs << data - if @hs.finished? - @handshaked = true - succeed - end - - receive_data(@hs.leftovers) if @hs.leftovers - else - @frame << data - while msg = @frame.next - @stream.call(msg) if @stream - end - end - end - - def send_msg(s, args={}) - type = args[:type] || :text - frame = ::WebSocket::Frame::Outgoing::Client.new(:data => s, :type => type, :version => @hs.version) - send_data frame.to_s - end - - def unbind - super - @disconnect.call if @disconnect - end - end -end From 963b4725b6a20dcbc2ce50ce953c9c0dbf96b479 Mon Sep 17 00:00:00 2001 From: jackorp Date: Fri, 11 May 2018 19:17:04 +0200 Subject: [PATCH 3/4] Bump package version --- rubygem-em-websocket.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-em-websocket.spec b/rubygem-em-websocket.spec index 2610091..fb95a9d 100644 --- a/rubygem-em-websocket.spec +++ b/rubygem-em-websocket.spec @@ -81,7 +81,7 @@ popd %{gem_instdir}/spec %changelog -* Thu Apr 5 2018 Jaroslav Prokop - 1:0.5.1-1 +* Fri May 11 2018 Jaroslav Prokop - 1:0.5.1-3 - The package does not have packages needed for tests in f28 * Thu Apr 5 2018 Jaroslav Prokop - 0.5.1-2 From 81461a91440889d2fd03bf80410177a0b754b47b Mon Sep 17 00:00:00 2001 From: jackorp Date: Fri, 11 May 2018 19:19:47 +0200 Subject: [PATCH 4/4] Update Release number Forgot to update the Release number --- rubygem-em-websocket.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-em-websocket.spec b/rubygem-em-websocket.spec index fb95a9d..a963656 100644 --- a/rubygem-em-websocket.spec +++ b/rubygem-em-websocket.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Version: 0.5.1 -Release: 1%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: EventMachine based WebSocket server License: MIT