i3ipc 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1656014a13ed6678e5efba71d74c72e7d910906
-  data.tar.gz: c41b56ab703cf2bc2322ed83218aa7f696e2552f
+SHA256:
+  metadata.gz: 307a0123538855e09af5e01c6484533407be5bc08d8352d02c6073e439abb920
+  data.tar.gz: 18c8fe77d241cd6d357bb90b71e4dd68f50d6bcd01be3a8328861b037ca738b2
 SHA512:
-  metadata.gz: 38f1d719f5c32f6ebd335d376481e76cb6be67ecba380af9753792654b05cf6adeecdb54847089fbf91372c3994291861d1cd49d22e9e660d3c62a9f1a3b5d69
-  data.tar.gz: 136c448a42f39671740959c11c5beca1cd5f16115f2e983b590e6d60dbfd9ee480decde1f66b2c3fa4376ac708b5abe771fe055fd10f0ee2a676ba1adc2f045f
+  metadata.gz: 974bd5a6d1ec54be2d29807d7beb58b7d8bb65c518288efdc8a59470965a67157a8a5e463d62fe5bcf01b2d5c79ce096c1ae90291cff1908734b5335c8f56320
+  data.tar.gz: 94f3a38c802b40dea4f4f3e8e9164c108a714c3179ca8ebf51dfe3dfcc33c4d1641d148d512c0ec30398030318be322236124c80ac5198060eaa330f4bd96f69

data/.rspec

@@ -0,0 +1 @@
+--format documentation --color

data/Gemfile

@@ -1,4 +1,9 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in i3ipc.gemspec
-gemspec
+source "https://rubygems.org"
+ 
+gem 'rspec'
+ 
+group :development do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'pry'
+end

data/Guardfile

@@ -0,0 +1,5 @@
+guard :rspec, cmd: 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/lib/i3ipc/connection.rb

@@ -27,9 +27,9 @@ module I3Ipc
   #   con.close
   class Connection
 
-    def initialize(connect = true)
-      @protocol = Protocol.new
-      open
+    def initialize(protocol = Protocol.new, autoconnect = true)
+      @protocol = protocol
+      open if autoconnect
     end
 
     def open
@@ -89,7 +89,7 @@ module I3Ipc
 
     private
 
-    def reply_for(type, message = nil, events=nil)
+    def reply_for(type, message = nil)
       @protocol.send(type, message)
 
       Reply.parse(@protocol.receive type)
@@ -106,6 +106,5 @@ module I3Ipc
       else raise WrongEvent.new(event)
       end
     end
-
   end
 end

data/lib/i3ipc/protocol.rb

@@ -150,8 +150,15 @@ module I3Ipc
     end
 
     def get_socketpath
-      path = `i3 --get-socketpath`.chomp!
-      raise 'Unable to get i3 socketpath' unless path
+      cmd = if system('i3 --version')
+        'i3'
+      elsif system('sway --version')
+        'sway'
+      else
+        raise 'Unable to find i3 compatible window manager'
+      end
+      path = `#{cmd} --get-socketpath`.chomp!
+      raise 'Unable to get i3 compatible socketpath' unless path
       path
     end
 

data/lib/i3ipc/reply.rb

@@ -45,7 +45,7 @@ module I3Ipc
       parse_data JSON.parse(response)
     end
 
-    # Indicates whether this reply success or not.
+    # Indicates whether this reply is successful or not.
     #
     # @return false if this reply represents and error from i3-ipc protocol.
     #   Otherwise returns true, which means that request is successful and

data/lib/i3ipc/version.rb

@@ -1,3 +1,3 @@
 module I3ipc
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/i3ipc/connection_spec.rb

@@ -3,43 +3,81 @@ require 'spec_helper'
 module I3Ipc
   describe Connection do
 
+    let(:protocol) { Protocol.new '' }
+    let(:stub_protocol) do
+      allow(protocol).to receive(:send)
+      allow(protocol).to receive(:receive)
+    end
+    subject { Connection.new protocol, false }
+
     describe '#command' do
+      it 'returns i3ipc reply' do
+        stub_protocol.and_return('{}')
+        expect(subject.command('cmd')).to be_a Reply
+      end
 
-      before(:all) do
-        class Connection
-          def initialize
-            @protocol = Protocol.new ''
-          end
-        end
+      it 'sends correct command and receives success response' do
+        stub_protocol.and_return({ success: true }.to_json)
+        expect(subject.command('focus left').success?).to be true
       end
 
-      it 'returns Reply object' do
-        allow_any_instance_of(Protocol).to receive(:send)
-        allow_any_instance_of(Protocol).to receive(:receive)
-          .and_return("{}")
+      it 'sends incorrect command and receives error response' do
+        stub_protocol.and_return({ success: false, error: 'wrong command' }.to_json)
+        reply = subject.command('my command')
+        expect(reply.success).to be false
+        expect(reply.error).to eql 'wrong command'
+      end
+    end
 
-        expect(Connection.new.command('cmd')).to be_a Reply
+    describe '#workspaces' do
+      it 'returns i3ipc reply' do
+        stub_protocol.and_return('{}')
+        expect(subject.workspaces).to be_a Reply
       end
+    end
 
-      it 'sends correct command and receives success response' do
-        allow_any_instance_of(Protocol).to receive(:send)
-        allow_any_instance_of(Protocol).to receive(:receive)
-          .and_return(%Q[{"success": true}])
+    describe '#outputs' do
+      it 'returns i3ipc reply' do
+        stub_protocol.and_return('{}')
+        expect(subject.outputs).to be_a Reply
+      end
+    end
 
-        connection = Connection.new
-        reply = connection.command('focus left')
-        expect(reply.success).to be true
+    describe '#tree' do
+      it 'returns i3ipc reply' do
+        stub_protocol.and_return('{}')
+        expect(subject.tree).to be_a Reply
       end
+    end
 
-      it 'sends incorrect command and receives error response' do
-        allow_any_instance_of(Protocol).to receive(:send)
-        allow_any_instance_of(Protocol).to receive(:receive)
-          .and_return(%Q[{"success": false, "error": "wrong command"}])
+    describe '#marks' do
+      it 'returns i3ipc reply' do
+        stub_protocol.and_return('{}')
+        expect(subject.marks).to be_a Reply
+      end
+    end
 
-        connection = Connection.new
-        reply = connection.command('my command')
-        expect(reply.success).to be false
-        expect(reply.error).to eql 'wrong command'
+    describe '#bar_config' do
+      it 'returns i3ipc reply' do
+        stub_protocol.and_return('{}')
+        expect(subject.bar_config).to be_a Reply
+      end
+    end
+
+    describe '#version' do
+      it 'returns i3ipc reply' do
+        stub_protocol.and_return('{}')
+        expect(subject.version).to be_a Reply
+      end
+
+      it 'able to parse version attributes' do
+        resp = { human_readable: '4.2', minor: 2, patch: 0, major: 4 }
+        stub_protocol.and_return(resp.to_json)
+        reply = subject.version
+        expect(reply.human_readable).to eq resp[:human_readable]
+        expect(reply.minor).to eq resp[:minor]
+        expect(reply.patch).to eq resp[:patch]
+        expect(reply.major).to eq resp[:major]
       end
     end
   end

data/spec/i3ipc/protocol_spec.rb

@@ -87,7 +87,7 @@ module I3Ipc
 
       it 'throws error if not connected' do
         subject.disconnect
-        expect { subject.send(type) }.to raise_error
+        expect { subject.send(type) }.to raise_error Protocol::NotConnected
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i3ipc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vitalii Elengaupt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,9 +64,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -101,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Interprocess communication with i3 wm
@@ -111,4 +113,3 @@ test_files:
 - spec/i3ipc/protocol_spec.rb
 - spec/i3ipc/reply_spec.rb
 - spec/spec_helper.rb
-has_rdoc: