totalspaces2 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87f5e5ecdee90fc2e0350b48fc730ecda225b74
-  data.tar.gz: defb44f1c8865d0bc6de35d48fded7a1570ace82
+  metadata.gz: a35ca4a8f18d11eaffa4fefe54e252c3235c65bd
+  data.tar.gz: d384467bf0080d07fb93521e1b54bac8aa141f6c
 SHA512:
-  metadata.gz: 47f2304089c5a008f3f1123562226b6d12f5999e845f2a299a8457e5a82598695ccb383e4acc40c385aa1c415bf024852b0c8bc0ae38cf2d71301fa6f7f476df
-  data.tar.gz: 71fa701e8034dc526c6018e7302189f33fa8f5535ed220172169361dc2cd0eb1ccf70ce8fba5350e63bda3b90c03df98cd15015ce5d53d4679b51e774d0c935c
+  metadata.gz: 28cf0083fd27abfd0e861ae8f241c1359f3c110380856df9489901ccd7060d6433016ce13c8b5b71662f0b5ced6a15908e2c94c756c2cc3423dd3bba9ab5b7d7
+  data.tar.gz: d77f8e8f4badc876659dc11c3042e5ae76452520ca7ee8d185bc2ec6d137cee57f049d119bacc48b0dab0190cf4b9d17ca25442d6d37c4bddf0e7fc326b86955

data/lib/TSLib.h

@@ -98,6 +98,14 @@ unsigned int tsapi_currentSpaceNumberOnDisplay(CGDirectDisplayID displayID);
  */
 const char *tsapi_spaceNameForSpaceNumberOnDisplay(unsigned int spaceNumber, CGDirectDisplayID displayID);
 
+/*
+ * The uuid for the given space number. This uniquely identifies the space, even when
+ * it is moved to a different position or to another monitor.
+ *
+ * You must call tsapi_freeString when you have finished with the returned string.
+ */
+const char *tsapi_uuidForSpaceNumberOnDisplay(unsigned int spaceNumber, CGDirectDisplayID displayID);
+
 /*
  * The total number of spaces.
  * This includes the dashboard if you have it set as a space, and any
@@ -228,6 +236,15 @@ bool tsapi_moveWindowToSpaceOnDisplay(unsigned int windowID, unsigned int spaceN
  */
 bool tsapi_moveSpaceToPositionOnDisplay(unsigned int spaceNumber, unsigned int positionNumber, CGDirectDisplayID displayID);
 
+/*
+ * Move a space to another position on another display
+ * You cannot use this displays have separate spaces is turned off.
+ * You cannot move a currently visible space.
+ *
+ * Returns true on success, false if any parameter was invalid.
+ */
+bool tsapi_moveSpaceOnDisplayToPositionOnDisplay(unsigned int spaceNumber, CGDirectDisplayID fromDisplayID, unsigned int positionNumber, CGDirectDisplayID toDisplayID);
+
 /*
  * Add desktops
  * There can usually be at most 16 desktops, unless desktops have migrated

data/lib/totalspaces2.rb

@@ -5,8 +5,7 @@
 # It is the officially supported way of using the API library libtotalspaces2api, and the required dylib 
 # comes bundled with this gem. This gem uses {Ruby-FFI}[link:https://github.com/ffi/ffi] to call the functions in the dylib.
 # You'll need a sane ruby and compilation environment to install ruby-ffi - it probably won't install immediately with the
-# ruby that comes with OSX because none of the compilation tools are present. We use {homebrew}[link:http://mxcl.github.com/homebrew/]
-# and {rbenv}[link:https://github.com/sstephenson/rbenv/] to manage our ruby scripting environment.
+# ruby that comes with OSX because none of the compilation tools are present - you'll need to install Xcode first.
 #
 # You may use this gem in various ways. For instance, you could:
 #
@@ -27,6 +26,9 @@
 #
 #  % [sudo] gem install totalspaces2
 #
+# You will need Xcode installed in order for the C compiler to be present in order to install
+# ruby-ffi, which is required (and automatically installed) by the totalspaces2 gem.
+#
 # Source code can be downloaded on GitHub
 #
 # * https://github.com/binaryage/totalspaces2-api
@@ -81,6 +83,7 @@ module TSApi  #:nodoc:
   
   attach_function :tsapi_currentSpaceNumberOnDisplay, [:uint], :uint
   attach_function :tsapi_spaceNameForSpaceNumberOnDisplay, [:uint, :uint], :pointer
+  attach_function :tsapi_uuidForSpaceNumberOnDisplay, [:uint, :uint], :pointer
   attach_function :tsapi_numberOfSpacesOnDisplay, [:uint], :uint
   
   attach_function :tsapi_definedColumnsOnDisplay, [:uint], :uint
@@ -104,6 +107,7 @@ module TSApi  #:nodoc:
   attach_function :tsapi_moveWindowToSpaceOnDisplay, [:uint, :uint, :uint], :bool
   
   attach_function :tsapi_moveSpaceToPositionOnDisplay, [:uint, :uint, :uint], :bool
+  attach_function :tsapi_moveSpaceOnDisplayToPositionOnDisplay, [:uint, :uint, :uint, :uint], :bool
   
   attach_function :tsapi_addDesktopsOnDisplay, [:uint, :uint], :uint
   attach_function :tsapi_removeDesktopsOnDisplay, [:uint, :uint], :bool
@@ -246,7 +250,7 @@ module TotalSpaces2
     end
 
     # Returns the number of the current space on the given display. 
-    # Space numbering starts at 1
+    # Space numbering starts at 1.
     #
     #   display_id = TotalSpaces2.displays[0]
     #   puts "Current space number: #{TotalSpaces2.current_space_on_display(display_id)}"
@@ -256,7 +260,7 @@ module TotalSpaces2
     end
     
     # Returns the name for a space on the main display. The returned string will be empty 
-    # if the space number is not valid
+    # if the space number is not valid.
     #
     #   current_space = TotalSpaces2.current_space
     #   puts "Current space is called: #{TotalSpaces2.name_for_space(current_space)}"
@@ -267,7 +271,7 @@ module TotalSpaces2
     end
 
     # Returns the name for a space. The returned string will be empty if the space number is
-    # not valid
+    # not valid.
     #
     #   current_space = TotalSpaces2.current_space
     #   display_id = TotalSpaces2.main_display[:display_id]
@@ -278,6 +282,29 @@ module TotalSpaces2
       name.force_encoding("UTF-8")
     end
     
+    # Returns the uuid for a space on the main display. The returned string will be empty 
+    # if the space number is not valid.
+    #
+    #   current_space = TotalSpaces2.current_space
+    #   puts "Current space uuid is: #{TotalSpaces2.uuid_for_space(current_space)}"
+    #
+    def uuid_for_space(space_number)
+      uuid = string_and_free(TSApi.tsapi_uuidForSpaceNumberOnDisplay(space_number, 0))
+      uuid.force_encoding("UTF-8")
+    end
+    
+    # Returns the uuid for a space. The returned string will be empty 
+    # if the space number is not valid.
+    #
+    #   current_space = TotalSpaces2.current_space
+    #   display_id = TotalSpaces2.main_display[:display_id]
+    #   puts "Current space uuid is: #{TotalSpaces2.uuid_for_space_on_display(current_space, display_id)}"
+    #
+    def uuid_for_space_on_display(space_number, display_id)
+      uuid = string_and_free(TSApi.tsapi_uuidForSpaceNumberOnDisplay(space_number, display_id))
+      uuid.force_encoding("UTF-8")
+    end
+    
     # Returns the total number of spaces including fullscreens, dashboard (if it's a space).
     #
     #   puts "Total number of spaces: #{TotalSpaces2.number_of_spaces}"
@@ -499,7 +526,7 @@ module TotalSpaces2
     #   TotalSpaces2.move_space_to_position(4, 2)
     #
     def move_space_to_position(space_number, position_number)
-      TSApi.tsapi_moveSpaceToPositionOnDisplay(space_number, position_number)
+      TSApi.tsapi_moveSpaceToPositionOnDisplay(space_number, position_number, 0)
     end
 
     # Move space to a new position in the grid. Spaces can only be moved 
@@ -514,6 +541,19 @@ module TotalSpaces2
       TSApi.tsapi_moveSpaceToPositionOnDisplay(space_number, position_number, display_id)
     end
     
+    # Move space to a new position on another screen.
+    # This won't work if you do not have displays have separate spaces enabled.
+    #
+    # Returns false if any parameters are not valid.
+    #
+    #   display_id = TotalSpaces2.main_display[:display_id]
+    #   display2_id = TotalSpaces2.display_list[1][:display_id]
+    #   TotalSpaces2.move_space_on_display_to_position_on_display(2, display_id, 1, display2_id)
+    #
+    def move_space_on_display_to_position_on_display(space_number, from_display_id, position_number, to_display_id)
+      TSApi.tsapi_moveSpaceOnDisplayToPositionOnDisplay(space_number, from_display_id, position_number, to_display_id)
+    end
+
     # Add desktops
     # There can be at most 16 desktops unless the display has collected some when
     # a secondary display has been unplugged.

metadata

@@ -1,27 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: totalspaces2
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
 description: This allows you to control the TotalSpaces2 desktop manager for mac from
@@ -31,32 +37,33 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.rdoc
 - MIT_LICENCE
-- lib/totalspaces2.rb
-- lib/libtotalspaces2api.dylib
+- README.rdoc
 - lib/TSLib.h
+- lib/libtotalspaces2api.dylib
+- lib/totalspaces2.rb
 homepage: https://github.com/binaryage/totalspaces2-api/tree/master/ruby
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: TotalSpaces2 control from ruby