lerna 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d1d9ed67341c040754c33479daf18d66bd4fc7
-  data.tar.gz: fc89547a2e6c6e55f437a82ad08bbdfa6589db80
+  metadata.gz: 1bed2261a5c6fe13da1642a415bf00be782cb2c0
+  data.tar.gz: 7519c43ab8c1864464ef4f87f6b5bf327d52d88f
 SHA512:
-  metadata.gz: f8a4dd8509a4dd6771765971b1cfc2d6da6a877eb7f53f1a5641cb86631d0f4a06bf75570c8c796aa5c97a5c760457968b1ffe4f3c3900e78f040de6ca91e693
-  data.tar.gz: a54b275de9b370169e08117af82271f44b7c7f0227a589243dfa726b8604d490dadf6dce116c25cfbc20a3834240857c7b3eae276a6eb0e2f8cde19cdc7c28c4
+  metadata.gz: 35c9bd3b9c74caace613f476f53558764244d85695ee2c6ff9cab9b1281232c72e88190621291248e5b0e77efb9906702ff4e4f741b3107cc89d7fb95f004190
+  data.tar.gz: 60e17fcf3419825ea7972290119afdeb11f99244ddb9d72b7d31664233559f21a49e565052d108e22b8875fc785641d00cee93dfe711a4aba1c2beae285a3047

data/bin/lerna

@@ -1,17 +1,15 @@
 #!/usr/bin/env ruby
 
+require 'logger'
 require 'optparse'
 require 'lerna/runner'
 require 'lerna/strategy'
 
-LOGGER = lambda { |str|
-  time = Time.now.utc
-  timestamp = time.strftime('%Y-%m-%dT%H:%M:%S.') << '%06dZ' % time.usec
-  puts '[%s #%d] %s' % [timestamp, Process.pid, str]
-}
+logger = Logger.new(STDOUT)
+logger.level = Logger::INFO
 
 options = {
-  strategies: %w[ dual-external external-digital-only internal-only ],
+  strategies: %w[ wall external-only internal-only ],
   system: method(:system)
 }
 
@@ -20,7 +18,7 @@ executable = File.basename(__FILE__)
 parser = OptionParser.new { |opts|
   opts.banner = "Usage: #{executable} [options]"
   opts.on(
-    '-s', '--strategies', String,
+    '-s', '--strategies STRATEGIES', String,
     'Strategies in order of precedence, separated by commas',
     "Default is #{options[:strategies].join(',')}",
     "Available: #{Lerna::Strategy.registry.keys.join(' ')}"
@@ -34,8 +32,14 @@ parser = OptionParser.new { |opts|
     options[:system] = ->(*args) { LOGGER.call(args.join(' ')) }
   end
   opts.on(
-    "-h", "--help",
-    "Display this help message and exit"
+    '-v', '--verbose',
+    'Log debugging information'
+  ) do
+    logger.level = Logger::DEBUG
+  end
+  opts.on(
+    '-h', '--help',
+    'Display this help message and exit'
   ) do
     puts opts
     exit
@@ -44,13 +48,13 @@ parser = OptionParser.new { |opts|
 parser.parse!
 
 runner = Lerna::Runner.new(
-  logger: LOGGER,
+  logger: logger,
   strategies: options[:strategies],
   system: options[:system]
 )
 
 trap('TERM') {
-  LOGGER.call('Exiting')
+  logger.info('Exiting')
   exit
 }
 

data/lib/lerna/runner.rb

@@ -16,23 +16,19 @@ module Lerna
       state.scan!
       return unless state.changed?
 
-      log state_summary
+      logger.debug state_summary
       strategy = find_strategy
       if strategy
-        log "Using #{strategy.class}"
+        logger.info "Using #{strategy.class}"
         apply_strategy strategy
       else
-        log 'No applicable strategy found'
+        logger.warn 'No applicable strategy found'
       end
     end
 
   private
 
-    attr_reader :state, :strategy_selector, :strategies
-
-    def log(s)
-      @logger.call(s)
-    end
+    attr_reader :state, :strategy_selector, :strategies, :logger
 
     def state_summary
       state.displays.
@@ -45,11 +41,13 @@ module Lerna
     end
 
     def apply_strategy(strategy)
-      system 'xrandr', *strategy.configuration
+      system 'xrandr', *strategy.preconfigure
+      system 'xrandr', *strategy.configure
       system 'xset dpms force on'
     end
 
     def system(*args)
+      logger.debug args.join(' ')
       @system.call(*args)
     end
   end

data/lib/lerna/strategies.rb

@@ -1,4 +1,12 @@
-Dir[File.expand_path('../strategies/*.rb', __FILE__)].each do |path|
-  name = File.basename(path, '.rb')
-  require "lerna/strategies/#{name}"
-end
+require 'lerna/strategy'
+require 'lerna/strategies/external_digital_only'
+require 'lerna/strategies/internal_only'
+require 'lerna/strategies/portrait_wall'
+require 'lerna/strategies/wall'
+
+Lerna::Strategy.register(
+  'external-only' => Lerna::Strategies::ExternalDigitalOnly,
+  'internal-only' => Lerna::Strategies::InternalOnly,
+  'portrait-wall' => Lerna::Strategies::PortraitWall,
+  'wall' => Lerna::Strategies::Wall
+)

data/lib/lerna/strategies/external_digital_only.rb

@@ -7,14 +7,13 @@ module Lerna
         winner
       end
 
-      def configuration
-        [].tap { |conf|
-          disconnected = displays - [winner]
-          disconnected.each do |d|
-            conf << '--output' << d.name << '--off'
-          end
-          conf << '--output' << winner.name << '--auto'
-        }
+      def preconfigure
+        disconnected = displays - [winner]
+        disconnected.flat_map { |d| ['--output', d.name, '--off'] }
+      end
+
+      def configure
+        ['--output', winner.name, '--auto']
       end
 
     private

data/lib/lerna/strategies/internal_only.rb

@@ -7,14 +7,15 @@ module Lerna
         displays.select(&:connected?).all?(&:internal?)
       end
 
-      def configuration
-        [].tap { |conf|
-          displays.reject(&:connected?).each do |d|
-            conf << '--output' << d.name << '--off'
-          end
-          displays.select(&:connected?).each do |d|
-            conf << '--output' << d.name << '--auto'
-          end
+      def preconfigure
+        displays.reject(&:connected?).flat_map { |d|
+          ['--output', d.name, '--off']
+        }
+      end
+
+      def configure
+        displays.select(&:connected?).flat_map { |d|
+          ['--output', d.name, '--auto']
         }
       end
     end

data/lib/lerna/strategies/portrait_wall.rb

@@ -0,0 +1,13 @@
+require 'lerna/strategies/wall'
+
+module Lerna
+  module Strategies
+    class PortraitWall < Wall
+    private
+
+      def configure_one(name)
+        ['--output', name, '--auto', '--rotate', 'left']
+      end
+    end
+  end
+end

data/lib/lerna/strategies/wall.rb

@@ -0,0 +1,39 @@
+require 'lerna/strategy'
+
+module Lerna
+  module Strategies
+    class Wall < Strategy
+      def applicable?
+        wanted_displays.length >= 2
+      end
+
+      def preconfigure
+        disconnected = displays - wanted_displays
+        disconnected.flat_map { |d|
+          ['--output', d.name, '--off']
+        }
+      end
+
+      def configure
+        names = wanted_displays.map(&:name)
+        leftmost = configure_one(names.first)
+        names.each_cons(2).inject(leftmost) { |a, (l, r)|
+          a + configure_one(r) + ['--right-of', l]
+        }
+      end
+
+    private
+
+      def wanted_displays
+        displays.
+          select(&:connected?).
+          select { |d| d.external? && d.digital? }.
+          sort_by(&:name)
+      end
+
+      def configure_one(name)
+        ['--output', name, '--auto', '--rotate', 'normal']
+      end
+    end
+  end
+end

data/lib/lerna/strategy.rb

@@ -4,10 +4,8 @@ module Lerna
       @registry ||= {}
     end
 
-    def self.inherited(subclass)
-      name = subclass.to_s.split(/::/).last
-      hyphenated = name.scan(/[A-Z][a-z_0-9]+/).map(&:downcase).join('-')
-      registry[hyphenated] = subclass
+    def self.register(names_and_classes)
+      registry.merge!(names_and_classes)
     end
 
     def initialize(displays)

data/lib/lerna/version.rb

@@ -1,3 +1,3 @@
 module Lerna
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/external_digital_only_strategy_spec.rb

@@ -22,11 +22,16 @@ RSpec.describe Lerna::Strategies::ExternalDigitalOnly do
     it { is_expected.to be_applicable }
 
     it 'configures the connected external display' do
-      expect(subject.configuration).to eq(%w[
+      expect(subject.configure).to eq(%w[
+        --output DP1 --auto
+      ])
+    end
+
+    it 'disables all other displays' do
+      expect(subject.preconfigure).to eq(%w[
         --output LVDS1 --off
         --output DP2   --off
         --output VGA1  --off
-        --output DP1   --auto
       ])
     end
   end

data/spec/internal_only_strategy_spec.rb

@@ -16,11 +16,16 @@ RSpec.describe Lerna::Strategies::InternalOnly do
     it { is_expected.to be_applicable }
 
     it 'configures the internal display' do
-      expect(subject.configuration).to eq(%w[
-        --output DP1 --off
+      expect(subject.configure).to eq(%w[
         --output LVDS1 --auto
       ])
     end
+
+    it 'disables all other displays' do
+      expect(subject.preconfigure).to eq(%w[
+        --output DP1 --off
+      ])
+    end
   end
 
   context 'when an internal and an external display are connected' do

data/spec/portrait_wall_strategy_spec.rb

@@ -0,0 +1,89 @@
+require 'lerna/strategies/portrait_wall'
+
+RSpec.describe Lerna::Strategies::PortraitWall do
+  subject {
+    described_class.new(displays)
+  }
+
+  context 'when fewer than two external digital displays are connected' do
+    let(:displays) {
+      [
+        double(name: 'LVDS1', external?: false,
+               connected?: true, digital?: true),
+        double(name: 'DP1', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'DP2', external?: true,
+               connected?: false, digital?: true),
+        double(name: 'VGA1', external?: true,
+               connected?: false, digital?: false)
+      ]
+    }
+
+    it { is_expected.not_to be_applicable }
+  end
+
+  context 'when two external digital displays are connected' do
+    let(:displays) {
+      [
+        double(name: 'LVDS1', external?: false,
+               connected?: true, digital?: true),
+        double(name: 'DP1', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'DP2', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'VGA1', external?: true,
+               connected?: false, digital?: false)
+      ]
+    }
+
+    it { is_expected.to be_applicable }
+
+    it 'configures the connected external displays in alphanumeric order' do
+      expect(subject.configure).to eq(%w[
+        --output DP1 --auto --rotate left
+        --output DP2 --auto --rotate left --right-of DP1
+      ])
+    end
+
+    it 'disables all other displays' do
+      expect(subject.preconfigure).to eq(%w[
+        --output LVDS1 --off
+        --output VGA1  --off
+      ])
+    end
+  end
+
+  context 'when three external digital displays are connected' do
+    let(:displays) {
+      [
+        double(name: 'LVDS1', external?: false,
+               connected?: true, digital?: true),
+        double(name: 'HDMI1', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'DP1', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'DP2', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'VGA1', external?: true,
+               connected?: false, digital?: false)
+      ]
+    }
+
+    it { is_expected.to be_applicable }
+
+    it 'configures the connected external displays in alphanumeric order' do
+      expect(subject.configure).to eq(%w[
+        --output DP1   --auto --rotate left
+        --output DP2   --auto --rotate left --right-of DP1
+        --output HDMI1 --auto --rotate left --right-of DP2
+      ])
+    end
+
+    it 'disables all other displays' do
+      expect(subject.preconfigure).to eq(%w[
+        --output LVDS1 --off
+        --output VGA1  --off
+      ])
+    end
+  end
+end

data/spec/runner_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Lerna::Runner do
       strategy_selector: strategy_selector
     )
   }
-  let(:logger) { double('logger', call: nil) }
+  let(:logger) { double('logger', debug: nil, info: nil, warn: nil) }
   let(:system) { double('system', call: nil) }
   let(:strategies) { double('strategies') }
   let(:strategy_selector) { double('strategy_selector', call: nil) }
@@ -51,12 +51,21 @@ RSpec.describe Lerna::Runner do
 
     context 'when a strategy is found' do
       let(:strategy) {
-        double('strategy', configuration: %w[ --option --another ])
+        double(
+          'strategy',
+          configure: %w[ --option --another ],
+          preconfigure: %w[ --off1 --off2 ]
+        )
       }
       let(:strategy_selector) {
         double('strategy_selector', call: strategy)
       }
 
+      it 'calls xrandr with the strategy preconfiguration' do
+        expect(system).to receive(:call).
+          with('xrandr', '--off1', '--off2')
+      end
+
       it 'calls xrandr with the strategy configuration' do
         expect(system).to receive(:call).
           with('xrandr', '--option', '--another')

data/spec/strategy_spec.rb

@@ -3,7 +3,7 @@ require 'lerna/strategies/external_digital_only'
 
 RSpec.describe Lerna::Strategy do
   it 'registers subclasses' do
-    expect(described_class.registry.fetch('external-digital-only')).
+    expect(described_class.registry.fetch('external-only')).
       to eq(Lerna::Strategies::ExternalDigitalOnly)
   end
 end

data/spec/wall_strategy_spec.rb

@@ -0,0 +1,89 @@
+require 'lerna/strategies/wall'
+
+RSpec.describe Lerna::Strategies::Wall do
+  subject {
+    described_class.new(displays)
+  }
+
+  context 'when fewer than two external digital displays are connected' do
+    let(:displays) {
+      [
+        double(name: 'LVDS1', external?: false,
+               connected?: true, digital?: true),
+        double(name: 'DP1', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'DP2', external?: true,
+               connected?: false, digital?: true),
+        double(name: 'VGA1', external?: true,
+               connected?: false, digital?: false)
+      ]
+    }
+
+    it { is_expected.not_to be_applicable }
+  end
+
+  context 'when two external digital displays are connected' do
+    let(:displays) {
+      [
+        double(name: 'LVDS1', external?: false,
+               connected?: true, digital?: true),
+        double(name: 'DP1', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'DP2', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'VGA1', external?: true,
+               connected?: false, digital?: false)
+      ]
+    }
+
+    it { is_expected.to be_applicable }
+
+    it 'configures the connected external displays in alphanumeric order' do
+      expect(subject.configure).to eq(%w[
+        --output DP1 --auto --rotate normal
+        --output DP2 --auto --rotate normal --right-of DP1
+      ])
+    end
+
+    it 'disables all other displays' do
+      expect(subject.preconfigure).to eq(%w[
+        --output LVDS1 --off
+        --output VGA1  --off
+      ])
+    end
+  end
+
+  context 'when three external digital displays are connected' do
+    let(:displays) {
+      [
+        double(name: 'LVDS1', external?: false,
+               connected?: true, digital?: true),
+        double(name: 'HDMI1', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'DP1', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'DP2', external?: true,
+               connected?: true, digital?: true),
+        double(name: 'VGA1', external?: true,
+               connected?: false, digital?: false)
+      ]
+    }
+
+    it { is_expected.to be_applicable }
+
+    it 'configures the connected external displays in alphanumeric order' do
+      expect(subject.configure).to eq(%w[
+        --output DP1   --auto --rotate normal
+        --output DP2   --auto --rotate normal --right-of DP1
+        --output HDMI1 --auto --rotate normal --right-of DP2
+      ])
+    end
+
+    it 'disables all other displays' do
+      expect(subject.preconfigure).to eq(%w[
+        --output LVDS1 --off
+        --output VGA1  --off
+      ])
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lerna
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,21 +67,23 @@ files:
 - lib/lerna/runner.rb
 - lib/lerna/state.rb
 - lib/lerna/strategies.rb
-- lib/lerna/strategies/dual_external.rb
 - lib/lerna/strategies/external_digital_only.rb
 - lib/lerna/strategies/internal_only.rb
+- lib/lerna/strategies/portrait_wall.rb
+- lib/lerna/strategies/wall.rb
 - lib/lerna/strategy.rb
 - lib/lerna/strategy_selector.rb
 - lib/lerna/version.rb
 - spec/display_enumerator_spec.rb
 - spec/display_spec.rb
-- spec/dual_external_strategy_spec.rb
 - spec/external_digital_only_strategy_spec.rb
 - spec/internal_only_strategy_spec.rb
+- spec/portrait_wall_strategy_spec.rb
 - spec/runner_spec.rb
 - spec/state_spec.rb
 - spec/strategy_selector_spec.rb
 - spec/strategy_spec.rb
+- spec/wall_strategy_spec.rb
 - support/lerna.conf
 homepage: http://github.com/threedaymonk/lerna
 licenses:

data/lib/lerna/strategies/dual_external.rb

@@ -1,32 +0,0 @@
-require 'lerna/strategy'
-
-module Lerna
-  module Strategies
-    class DualExternal < Strategy
-      def applicable?
-        wanted_displays.length == 2
-      end
-
-      def configuration
-        [].tap { |conf|
-          disconnected = displays - wanted_displays
-          disconnected.each do |d|
-            conf << '--output' << d.name << '--off'
-          end
-          conf << '--output' << wanted_displays[0].name << '--auto'
-          conf << '--output' << wanted_displays[1].name << '--auto' <<
-            '--right-of' << wanted_displays[0].name
-        }
-      end
-
-    private
-
-      def wanted_displays
-        displays.
-          select(&:connected?).
-          select { |d| d.external? && d.digital? }.
-          sort_by(&:name)
-      end
-    end
-  end
-end

data/spec/dual_external_strategy_spec.rb

@@ -1,50 +0,0 @@
-require 'lerna/strategies/dual_external'
-
-RSpec.describe Lerna::Strategies::DualExternal do
-  subject {
-    described_class.new(displays)
-  }
-
-  context 'when fewer than two external digital displays are connected' do
-    let(:displays) {
-      [
-        double(name: 'LVDS1', external?: false,
-               connected?: true, digital?: true),
-        double(name: 'DP1', external?: true,
-               connected?: true, digital?: true),
-        double(name: 'DP2', external?: true,
-               connected?: false, digital?: true),
-        double(name: 'VGA1', external?: true,
-               connected?: false, digital?: false)
-      ]
-    }
-
-    it { is_expected.not_to be_applicable }
-  end
-
-  context 'when two external digital displays are connected' do
-    let(:displays) {
-      [
-        double(name: 'LVDS1', external?: false,
-               connected?: true, digital?: true),
-        double(name: 'DP1', external?: true,
-               connected?: true, digital?: true),
-        double(name: 'DP2', external?: true,
-               connected?: true, digital?: true),
-        double(name: 'VGA1', external?: true,
-               connected?: false, digital?: false)
-      ]
-    }
-
-    it { is_expected.to be_applicable }
-
-    it 'configures the connected external display' do
-      expect(subject.configuration).to eq(%w[
-        --output LVDS1 --off
-        --output VGA1  --off
-        --output DP1   --auto
-        --output DP2   --auto --right-of DP1
-      ])
-    end
-  end
-end