xrandr 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7bb660cead9fafcbb58f35a0eb7c3981f9c4f20
-  data.tar.gz: cd6d57377f91e780b8a5a74e91887f1abb9f58b0
+  metadata.gz: c94bc868f6a3f45ed747869a7af9c02debf416a1
+  data.tar.gz: 9decdce0d71fa37c754397320dde46542e35b667
 SHA512:
-  metadata.gz: 968287ec8fd4c1159c40b7087a1047a06a9f79f176617ed72c1241130b7ef3891aaa77e0991fdccfe09623536ba943dbc8e7fa78686eb2468957eaf73dd7f7e9
-  data.tar.gz: 4eb35f1d52c17e46442d637c4a29ddaabf6873920fab6a45adf6695e5446edf2a3ff2306f9d19cd0250f87fb9f2938b520a7c2e8137da28ca8407539de9cd6d5
+  metadata.gz: 0c5dcda826aae40ac37bdfbcd8cbcf8af7ba24512ccd08d3c36193f3f167b023da5699e2d1ed6471688a4d2379220013688d88665a407a5e52571f3ef7f0c529
+  data.tar.gz: 78cd193b81fb9f6f5d1d839ffcfe5e7d5af75a082ebe0574dec943fc9ff0b1d45f491dfd5f26b94dc13bc819555ae341213ab764c8e9bc5da5ec96bb7345572b

data/README.md

@@ -16,29 +16,39 @@ Gives you the status of each of the outputs
 
 ```ruby
 
-Xrandr.new.outputs #=> [ <Xrandr::Output{ id: 1, name: 'LVDS1', connected: true, mode: '1920x1080' }>, <Xrandr::Output { id: 2, name: 'VGA1', connected: false }> ]
+Xrandr::Control.new.outputs #=> [#<Xrandr::Output:0x00557ed8ed80a8 @name="eDP1", @connected=true, @primary=true, @resolution="1920x1080", @position="0x0", @info="(normal left inverted right x axis y axis)", @dimensions="344mm x 193mm", @modes=[#<Xrandr::Mode:0x00557ed8ed9cc8 @resolution="1920x1080", @rate="60.0", @current=true, @preferred=true>, ... ]>, #<Xrandr::Output:0x00557ed8711f40 @name="DP1", @connected=false, @primary=false, @resolution=nil, @position=nil, @info="(normal left inverted right x axis y axis)", @dimensions=nil, @modes=[]>, ... ]
 
 ```
 
-Access specific output parameters
+Access specific output parameters by index
 
 ```ruby
-randr = Xrandr.new
-vga = randr.output(1)
+xrandr = Xrandr::Control.new
+
+vga = xrandr.find_output(1)
+# or
+vga = xrandr[1]
+
+vga.status #=> 'on'  # possible values are:  'on'`, 'off' or 'disconnected'
 
 vga.connected #=> true
 vga.name #=> 'VGA1'
-vga.mode #=> '1920x1080'
+vga.current # returns the current Xrandr::Mode for this display. nil if disconnected or off
 
 ```
 
+Access specific output parameters by name
+
 ```ruby
-randr = Xrandr.new
-vga = randr.output('VGA1')
+x = Xrandr::Control.new
+
+vga = xrandr.find_output('VGA1')
+# or
+vga = xrandr['VGA1']
 
 vga.connected #=> true
 vga.name #=> 'VGA1'
-vga.mode #=> '1920x1080'
+vga.current #=> '1920x1080'
 
 ```
 
@@ -46,7 +56,7 @@ vga.mode #=> '1920x1080'
 
 
 ```ruby
-xrandr = Xrandr.new
+xrandr = Xrandr::Control.new
 
 # setting global options
 xrandr.configure(fb: '1920x1080', no_primary: true)
@@ -80,7 +90,7 @@ For all available configuration parameter see you can `man xrandr`
 
 ## Contributing
 
-Open an issue, lets talk.
+Open an issue, a PR, or whatever you feel comfortable with.
 
 ## License
 

data/lib/xrandr.rb

@@ -1,5 +1,5 @@
 module Xrandr
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
   class Control
     attr_reader :screens, :outputs, :command
@@ -69,6 +69,7 @@ module Xrandr
               connected:  /connected|disconnected/,
               primary:    /primary/,
               resolution: /\d+x\d+\+\d+\+\d+/,
+              rotation:   /(inverted|left|right) \(/,
               info:       /\([^\)]+\)/,
               dimensions: /[0-9+]+mm x [0-9]+mm/,
              }
@@ -78,7 +79,11 @@ module Xrandr
       # split resolution and position values split all values, coherce to integers, split the array in halfs, assign each half)
       args[:resolution], args[:position] = args[:resolution].split(/x|\+/).each_slice(2).map {|v| v.join('x') }  if args[:resolution]
 
+      # Xrandr swaps resolution when display is rotated left or right
+      args[:resolution] = args[:resolution].split('x').reverse!.join('x') if args[:rotation] == 'left' || args[:rotation] == 'right'
+
       # Coherce parameters
+      args[:rotation] = args[:rotation] ? args[:rotation].first : 'normal'
       args[:connected] = args[:connected] == 'connected'
       args[:primary]   = args[:primary] == 'primary'
 
@@ -111,13 +116,13 @@ module Xrandr
   end
 
   class Output
-    attr_reader :name, :connected, :primary, :resolution, :position, :info, :dimensions, :modes
+    attr_reader :name, :connected, :primary, :resolution, :position, :rotation, :info, :dimensions, :modes
 
     ON = 'on'.freeze
     OFF = 'off'.freeze
     DISCONNECTED = 'disconnected'.freeze
 
-    def initialize(name:, connected:, primary: false, resolution: nil, position: nil, info: '', dimensions: '', modes: [])
+    def initialize(name:, connected:, primary: false, resolution: nil, position: nil, rotation: '', info: '', dimensions: '', modes: [])
       raise ArgumentError, "must provide a name for the output" unless name
       raise ArgumentError, "connected cant be nil" unless connected == true || connected == false
       @name = name
@@ -126,6 +131,7 @@ module Xrandr
       @resolution = resolution
       @position = position
       @info = info
+      @rotation = rotation
       @dimensions = dimensions
       @modes = modes
     end

data/test/parser_test.rb

@@ -96,6 +96,23 @@ module Xrandr
       assert_empty output.modes
     end
 
+    def test_parses_rotation
+      session = Parser.new
+
+      assert_equal 'inverted', session.parse_output(['eDP1 connected primary 1920x1080+0+0 inverted (normal left inverted right x axis y axis) 344mm x 193mm']).rotation
+      assert_equal 'left', session.parse_output(['eDP1 connected primary 1080x1920+0+0 left (normal left inverted right x axis y axis) 344mm x 193mm']).rotation
+      assert_equal 'right', session.parse_output(['eDP1 connected primary 1080x1920+0+0 right (normal left inverted right x axis y axis) 344mm x 193mm']).rotation
+      assert_equal 'normal', session.parse_output(['eDP1 connected primary 1920x1080+0+0 (normal left inverted right x axis y axis) 344mm x 193mm']).rotation
+    end
+
+    def test_when_rotated_returns_original_resolution
+      session = Parser.new
+
+      assert_equal '1920x1080', session.parse_output(['eDP1 connected primary 1920x1080+0+0 (normal left inverted right x axis y axis) 344mm x 193mm']).resolution
+      assert_equal '1920x1080', session.parse_output(['eDP1 connected primary 1920x1080+0+0 inverted (normal left inverted right x axis y axis) 344mm x 193mm']).resolution
+      assert_equal '1920x1080', session.parse_output(['eDP1 connected primary 1080x1920+0+0 left (normal left inverted right x axis y axis) 344mm x 193mm']).resolution
+      assert_equal '1920x1080', session.parse_output(['eDP1 connected primary 1080x1920+0+0 right (normal left inverted right x axis y axis) 344mm x 193mm']).resolution
+    end
   end
 
   class Parser::ParseModeTest < Minitest::Test

data/xrandr.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["fernando.martinez@live.com.ar"]
   spec.summary       = %q{ A ruby wrapper for Xrandr }
   spec.description   = %q{ A ruby wrapper for Xrandr }
-  spec.homepage      = "https://github.com/f-3r/xrandr"
+  spec.homepage      = "https://github.com/F-3r/xrandr.rb"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xrandr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Fernando Martínez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,7 +57,7 @@ files:
 - test/output_test.rb
 - test/parser_test.rb
 - xrandr.gemspec
-homepage: https://github.com/f-3r/xrandr
+homepage: https://github.com/F-3r/xrandr.rb
 licenses:
 - MIT
 metadata: {}
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A ruby wrapper for Xrandr