swm 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6737404f8274bcc90d25baabc3dea109decebb3a
-  data.tar.gz: 46d9434f2c901bedb01808f0d49ac7afe55159e8
+  metadata.gz: 7f50f3f5177da5b45f1a978104282c731c938c7b
+  data.tar.gz: d001853d778a5e530564ab8a589f8aa509e088b9
 SHA512:
-  metadata.gz: 7c7792e75db029104688077385a794685967b49f7ec429f94a1cdecad1c8d6432a90906a7f477956b75cb9c051aced4bc0552a17f5555c9296640226aefc466d
-  data.tar.gz: e6ada0b85afd5c74868ee306ffe5ba503c6f8e89185f334b113afb936f94bc2a672cc4f93dbb6db574b879e6ab2823d15774d69bc3f0c89f33fc0d57310f6ba3
+  metadata.gz: 5c09872afc8b12946708965ee9db6ea14ccb34b21925db6895c7037a6d375f38cc0c33174172e8b4b37ae0e5238a3a6c6fe8f455b5f0234dc51c6a56382aab5f
+  data.tar.gz: 165d8d3393603336ad635b7d4191843e07ae696953125ea6467fab0d3921aa626ef779651268b4b8246fda72460eba6946dbdf4bcdf2d96f8938606f845f569d

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+sandi_meter

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## Version 0.3.0 (current)
+
+This version contains breaking changes - still alpha-like
+
+ - New simple option parser instead of trollop
+ - Simpler bin file
+ - Simpler architecture
+ - Resize command rewritten, now has new args
+ - Move command rewritten and has new args
+
+## Version 0.2.0
+
+ - Resize is supported with the `resize` command
+
 ## Version 0.1.0
 
  - Moving windows is now supported with the `move` subcommand

data/Guardfile

@@ -1,4 +1,4 @@
-guard :rspec do
+guard :rspec, cmd: "bundle exec rspec -f documentation" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { "spec" }
   watch(%w[ spec/spec_helper.rb Gemfile.lock ])  { "spec" }

data/README.md

@@ -1,3 +1,5 @@
+[![Dependency Status](https://gemnasium.com/lasseebert/swm.png)](https://gemnasium.com/lasseebert/swm)
+
 # Simple Window Manager
 
 SWM is a utility to place and resize windows, written for Ubuntu. It might work with other *nix distributions.
@@ -32,33 +34,29 @@ It accepts parameters `x` and `y` which can both be specified in percentages of
 
 Examples:
 
-    swm move --x 50% --y 50%
+    swm move --x 50 --y 50
 
 Will center the window
 
-    swm move --x 0%
-
-Will move the window to the left edge of the sceen, preserving the Y position
-
-There are some predefined constants that can be used to specify position:
+    swm move --x 0 --y 100
 
- - For X these are: `left`, `middle` and `right`.
- - For Y it is: `top`, `middle`, `bottom`.
+Will move the window to the top right corner
 
-For example:
+### Resizing windows
 
-    swm move --x right --y middle
+Resize windows with the `resize` command
+It accepts `x`, `y`, `width` and `height`.
 
-Will move the window to the middle of the right edge.
+Example:
 
+    swm resize --x 10 --y 10 --width 80 --height 80
 
-### Resizing windows
+Will resize and move the window so that it has 10% of the screen size to all screen edges.
 
-Not yet supported
 
 ## Contributing
 
-1. Fork it
+1. Fork 8t
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/bin/swm

@@ -1,63 +1,23 @@
 #!/usr/bin/env ruby
 
-lib = File.expand_path('../../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require_relative '../lib/swm'
 
-require 'trollop'
-require 'swm'
+command_name = ARGV.shift
+command = Swm::Command.registered_commands[command_name]
 
-def run
-  options = get_options
+if command
   begin
-    Swm::CommandRunner.run options[:command], options[:command_options], options[:global_options]
-  rescue Exception => ex
-    puts ex.message
-    exit(1)
+    options = Swm::CliOptions.new(ARGV)
+    command.run(options)
+  rescue => e
+    puts e
+    command.print_help
   end
+else
+  puts <<-EOF
+Usage: swm <command> <options>
+Commands:
+  resize
+  move
+  EOF
 end
-
-def get_options
-  global_options = Trollop::options do
-    banner "utility that can move and resize windows"
-    stop_on %w[ move resize ]
-  end
-  { global_options: global_options }.merge get_command
-end
-
-def get_command
-  command = ARGV.shift
-  Trollop.die "no command" unless command
-  command = command.to_sym
-  { command: command }.merge get_command_options(command)
-end
-
-def get_command_options(command)
-  {
-    command_options: case command
-    when :move
-      get_move_options
-    when :resize
-      get_resize_options
-    else
-      Trollop::die "unknown command #{command.to_s}"
-    end
-  }
-end
-
-def get_move_options
-  Trollop::options do
-    opt :x, "The placement on the x-axis: left, middle, right, or 0%-100%", type: String
-    opt :y, "The placement on the y-axis: top, middle, bottom, or 0%-100%", type: String
-  end
-end
-
-def get_resize_options
-  Trollop::options do
-    opt :x1, "The placement of the left edge:   left, middle, right, or 0%-100%", type: String
-    opt :x2, "The placement of the right edge:  left, middle, right, or 0%-100%", type: String
-    opt :y1, "The placement of the top edge:    top, middle, bottom, or 0%-100%", type: String
-    opt :y2, "The placement of the bottom edge: top, middle, bottom, or 0%-100%", type: String
-  end
-end
-
-run

data/lib/swm.rb

@@ -1,7 +1,3 @@
-require_relative "swm/version"
-require_relative "swm/window"
-require_relative "swm/screen"
-require_relative "swm/command_runner"
-require_relative "swm/commands/command"
-require_relative "swm/commands/resize_command"
-require_relative "swm/commands/move_command"
+Dir["#{File.dirname(__FILE__)}/swm/**/*.rb"].each do |file|
+  require file
+end

data/lib/swm/cli_options.rb

@@ -0,0 +1,33 @@
+module Swm
+  class CliOptions < Hash
+
+    def initialize(args)
+      merge!(parse_options(args))
+    end
+
+    private
+
+    def parse_options(args)
+      pairs = args.each_slice(2)
+      pairs = pairs.map { |pair| parse_pair(pair) }
+      Hash[pairs]
+    end
+
+    def parse_pair(pair)
+      raise "Misplaced option value: #{pair[0]}" unless pair[0].start_with?('--')
+      raise "No option value for #{pair[0]}" if pair.length == 1
+      raise "Misplaced option key: #{pair[1]}" if pair[1].start_with?('--')
+      [pair[0].sub(/^--/, '').to_sym, decode_value(pair[1])]
+    end
+
+    def decode_value(arg)
+      if arg =~ /\d+/
+        arg.to_i
+      else
+        arg
+      end
+    end
+
+
+  end
+end

data/lib/swm/command.rb

@@ -0,0 +1,11 @@
+module Swm
+  class Command
+    def self.register(name, klass)
+      registered_commands[name] = klass
+    end
+
+    def self.registered_commands
+      @registered_commands ||= {}
+    end
+  end
+end

data/lib/swm/commands/move_command.rb

@@ -1,17 +1,42 @@
 module Swm
-  class MoveCommand < Command
+  class MoveCommand
 
-    def run
-      window = Swm::Window.current
+    Command.register("move", self)
+
+    def self.run(options)
+      new(options).run
+    end
+
+    def self.print_help
+      puts <<-EOF
+Usage: swm move <options>
+Options:
+  --x: Percentage of free screen width
+  --y: Percentage of free screen height
+Examples:
+  Center the window
+    swm resize --x 50 --y 50
+  Move the window to the top-right corner
+    swm resize --x 100 --y 0
+
+      EOF
+    end
+
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
 
-      x_percentage = get_x_percentage
-      y_percentage = get_y_percentage
+    def run
+      x_percent = options[:x]
+      y_percent = options[:y]
 
       screen_dimensions = Screen.dimensions
+      window = Swm::Window.current
 
-      x = y = nil
-      x = ((screen_dimensions[0] - window.width) * x_percentage / 100.0).to_i if x_percentage
-      y = ((screen_dimensions[1] - window.height) * y_percentage / 100.0).to_i if y_percentage
+      x = ((screen_dimensions[0] - window.width) * x_percent / 100.0).to_i
+      y = ((screen_dimensions[1] - window.height) * y_percent / 100.0).to_i
 
       window.move x, y
     end

data/lib/swm/commands/resize_command.rb

@@ -1,26 +1,66 @@
 module Swm
-  class ResizeCommand < Command
+  class ResizeCommand
 
-    def run
-      x1 = get_x_percentage :x1
-      x2 = get_x_percentage :x2
-      y1 = get_y_percentage :y1
-      y2 = get_y_percentage :y2
+    Command.register("resize", self)
+
+    def self.run(options)
+      new(options).run
+    end
 
+    def self.print_help
+      puts <<-EOF
+Usage: swm resize <options>
+Options:
+  --x:      X-coord of top-left corner in percent of screen
+  --y:      Y-ccord of top-left corner in percent of screen
+  --width:  Width in percent of screen
+  --height: Height in percent of screen
+  --left:   (Optional) Sets a left margin of the screen
+  --right:  (Optional) Sets a right margin of the screen
+  --top:    (Optional) Sets a top margin of the screen
+  --bottom: (Optional) Sets a bottom margin of the screen
+Examples:
+  Make window fill 80 percent of screen in each dimension with a 10 percent margin:
+    swm resize --x 10 --y 10 --width 80 --height 80
+      EOF
+    end
+
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
       screen_dimensions = Screen.dimensions
-      window = Swm::Window.current
+      rect = [0, 0, screen_dimensions[0], screen_dimensions[1]]
+      set_offset(rect)
+      resize_in_rect(rect)
+    end
+
+    private
+
+    def set_offset(rect)
+      rect[0] += options[:left] || 0
+      rect[2] -= options[:left] || 0
+      rect[1] += options[:top] || 0
+      rect[3] -= options[:top] || 0
+      rect[2] -= options[:right] || 0
+      rect[3] -= options[:bottom] || 0
+    end
 
-      x = y = width = height = nil
-      x =       (screen_dimensions[0] * x1 / 100.0).to_i if x1
-      y =       (screen_dimensions[1] * y1 / 100.0).to_i if y1
-      width =   (screen_dimensions[0] * x2 / 100.0).to_i - (x || window.pos_x) if x2
-      height =  (screen_dimensions[1] * y2 / 100.0).to_i - (y || window.pos_y) if y2
+    def resize_in_rect(rect)
+      x_percent = options[:x]
+      y_percent = options[:y]
+      width_percent = options[:width]
+      height_percent = options[:height]
 
-      puts "x: #{x}"
-      puts "y: #{y}"
-      puts "width: #{width}"
-      puts "height: #{height}"
+      x =       (rect[0] + rect[2] * x_percent / 100.0).to_i
+      y =       (rect[1] + rect[3] * y_percent / 100.0).to_i
+      width =   (rect[2] * width_percent / 100.0).to_i
+      height =  (rect[3] * height_percent / 100.0).to_i
 
+      window = Window.current
       window.set x, y, width, height
     end
 

data/lib/swm/version.rb

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

data/lib/swm/window.rb

@@ -1,5 +1,8 @@
 module Swm
   class Window
+
+    attr_reader :id
+
     def self.current
       Window.new `xdotool getwindowfocus`.to_i
     end
@@ -27,7 +30,7 @@ module Swm
     def move(x, y)
       x ||= pos_x
       y ||= pos_y
-      set x, y, nil, nil
+      set x, y, width, height
     end
 
     def set(x, y, w, h)
@@ -36,7 +39,8 @@ module Swm
       w ||= width
       h ||= height
       command = "wmctrl -i -r #{@id} -e 0,#{x},#{y},#{w},#{h}"
-      exec command
+      system command
+      raise "Error running #{command}" unless $?.success?
       clear_cache
     end
 

data/spec/spec_helper.rb

@@ -1,10 +1,3 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-
 require 'swm'
 
 RSpec.configure do |config|
@@ -18,5 +11,3 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 end
-RSpec.configure do |config|
-end

data/spec/unit/cli_options_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Swm::CliOptions do
+  describe '#initialize' do
+    it "should parse empty array" do
+      options = Swm::CliOptions.new([])
+      expect(options.size).to be_zero
+    end
+
+    it "should parse one named option" do
+      options = Swm::CliOptions.new(["--foo", "bar"])
+      expect(options.size).to eq(1)
+      expect(options[:foo]).to eq("bar")
+    end
+
+    it "should parse one named option with integer value" do
+      options = Swm::CliOptions.new(["--foo", "42"])
+      expect(options.size).to eq(1)
+      expect(options[:foo]).to eq(42)
+    end
+
+    it "should parse multiple named options" do
+      options = Swm::CliOptions.new(["--foo", "42", "--bar", "baz"])
+      expect(options.size).to eq(2)
+      expect(options[:foo]).to eq(42)
+      expect(options[:bar]).to eq("baz")
+    end
+
+    it "should complain about invalid options" do
+      invalid_inputs = [
+        ["--foo"],
+        ["--foo", "--bar"],
+        ["--foo", "42", "--bar"],
+        ["42", "--foo"]
+      ]
+      invalid_inputs.each do |input|
+        expect { Swm::CliOptions.new(input) }.to raise_error
+      end
+    end
+  end
+end

data/spec/unit/commands/resize_command_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Swm::ResizeCommand do
+end

data/swm.gemspec

@@ -24,8 +24,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trollop"
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,83 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: swm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Lasse Skindstad Ebert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: trollop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: "\n    Simple Window Manager is a utillity to move and place windows
@@ -91,8 +77,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -101,14 +87,16 @@ files:
 - Rakefile
 - bin/swm
 - lib/swm.rb
-- lib/swm/command_runner.rb
-- lib/swm/commands/command.rb
+- lib/swm/cli_options.rb
+- lib/swm/command.rb
 - lib/swm/commands/move_command.rb
 - lib/swm/commands/resize_command.rb
 - lib/swm/screen.rb
 - lib/swm/version.rb
 - lib/swm/window.rb
 - spec/spec_helper.rb
+- spec/unit/cli_options_spec.rb
+- spec/unit/commands/resize_command_spec.rb
 - spec/unit/window_spec.rb
 - swm.gemspec
 homepage: https://github.com/lasseebert/swm
@@ -121,20 +109,22 @@ 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.0
 signing_key: 
 specification_version: 4
 summary: Simple Window Manager for Ubuntu
 test_files:
 - spec/spec_helper.rb
+- spec/unit/cli_options_spec.rb
+- spec/unit/commands/resize_command_spec.rb
 - spec/unit/window_spec.rb

data/lib/swm/command_runner.rb

@@ -1,13 +0,0 @@
-module Swm
-
-  class CommandRunner
-    def self.run(command, command_options = {}, global_options = {})
-      command = get_command_class(command).new command_options, global_options
-      command.run
-    end
-
-    def self.get_command_class(command)
-      Swm.const_get "#{command.capitalize}Command"
-    end
-  end
-end

data/lib/swm/commands/command.rb

@@ -1,40 +0,0 @@
-module Swm
-  class Command
-    def initialize(command_options = {}, global_options = {})
-      @command_options = command_options
-      @global_options = global_options
-    end
-
-    def run
-      raise "Override in sub derived class"
-    end
-
-    def get_x_percentage(name = :x)
-      get_placement_percentage name, {
-        left: 0,
-        middle: 50,
-        right: 100
-      }
-    end
-
-    def get_y_percentage(name = :y)
-      get_placement_percentage name, {
-        top: 0,
-        middle: 50,
-        bottom: 100
-      }
-    end
-
-    def get_placement_percentage(name, constants)
-      raw_value = @command_options[name]
-      return nil if raw_value.nil?
-      if value = constants[raw_value.to_sym]
-        value
-      elsif /(\d+(\.\d+)?)\%/ =~ raw_value
-        $1.to_f
-      else
-        raise "Unknown placement option: #{raw_value}. Valid options are percentages (e.g. 30%) and [#{constants.map{|x| x.first.to_s}.join(' ')}]"
-      end
-    end
-  end
-end