dotpretty 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8205f1decc125ec0d793587399cc4ff3f7969a7eef4af49f329417bb7242e857
-  data.tar.gz: 87de6c2d74f51077c24148848494b89409dfc468423bb9689f043370110cf6e2
+  metadata.gz: f1d0018b1e41f70563e11d4c495a357e8df1b355f02df5e5663dc2d6062f2757
+  data.tar.gz: 7280f945df62f089cb2a53735cc464613400ffab68783a7a4f57c0d25a19dee4
 SHA512:
-  metadata.gz: 5f4f1bdadaf2d027fcb3390e65e9f4dd2b40f403efe9c345b6448090c0fe5e33ddaef5a87e2a87075a17e7e33cc1e959e742d90cc5bbfdb77674e3bdf3fbe22d
-  data.tar.gz: 31208e1b8de1e11b30c7c3281f2e9677a2c8021fd593c6e85f8f620cdacf217a82e118123ca2f5d5b93e332dd00777c56c081f596e4bb63a3e8faa59e826109f
+  metadata.gz: 1973ccb7c3a07c2b6f36fff91b1446577c0aa58b7180060a2186f06a929d379f52f92bf181f3d3081768edf93ec4cf73b702247841594daea2d9d68a05f23121
+  data.tar.gz: 896f15d3c8f1d9dd79cd8844ce32be59cdca11ee211ca0c5cef178bff90033b6f64c8a09ee8fa43a60b76ea1a975246f3274912c0d72c30e9ba1d33035dc1628

data/bin/dotpretty

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "dotpretty/colorers/bash"
-require "dotpretty/colorers/null"
+require "dotpretty/color_palettes/bash"
+require "dotpretty/color_palettes/null"
 require "dotpretty/reporters/names"
 require "dotpretty/runner"
 require "optparse"
@@ -33,9 +33,9 @@ OptionParser.new do |opts|
 
 end.parse!
 
-colorer = options[:color] ? Dotpretty::Colorers::Bash : Dotpretty::Colorers::Null
+color_palette = options[:color] ? Dotpretty::ColorPalettes::Bash : Dotpretty::ColorPalettes::Null
 runner = Dotpretty::Runner.new({
-  colorer: colorer,
+  color_palette: color_palette,
   output: STDOUT,
   reporter_name: options[:reporter_name]
 })

data/lib/dotpretty/{colorers → color_palettes}/bash.rb

@@ -1,5 +1,5 @@
 module Dotpretty
-  module Colorers
+  module ColorPalettes
     module Bash
 
       RESET="\e[0m"

data/lib/dotpretty/{colorers → color_palettes}/null.rb

@@ -1,5 +1,5 @@
 module Dotpretty
-  module Colorers
+  module ColorPalettes
     module Null
 
       def green(text)

data/lib/dotpretty/parser.rb

@@ -1,13 +1,13 @@
 require "dotpretty/aggregator"
 require "dotpretty/reporters/basic"
-require "dotpretty/state_machine_builder"
+require "dotpretty/state_machine/state_machine_builder"
 
 module Dotpretty
   class Parser
 
     def initialize(reporter:)
       self.aggregator = Dotpretty::Aggregator.new({ reporter: reporter })
-      self.state_machine = Dotpretty::StateMachineBuilder.build(aggregator) do
+      self.state_machine = Dotpretty::StateMachine::StateMachineBuilder.build(aggregator) do
         state :waiting do
           transition :build_started, :build_in_progress, :build_started
         end

data/lib/dotpretty/reporters/basic.rb

@@ -4,9 +4,9 @@ module Dotpretty
   module Reporters
     class Basic
 
-      def initialize(colorer:, output:)
-        self.colorer = colorer
-        self.extend(colorer)
+      def initialize(color_palette:, output:)
+        self.color_palette = color_palette
+        self.extend(color_palette)
         self.output = output
       end
 
@@ -55,12 +55,12 @@ module Dotpretty
 
       def colored_message(summary)
         return Dotpretty::Reporters::TestSummaryFormatter.new({
-          colorer: colorer,
+          color_palette: color_palette,
           summary: summary
         }).colored_message
       end
 
-      attr_accessor :colorer, :output
+      attr_accessor :color_palette, :output
 
     end
   end

data/lib/dotpretty/reporters/factory.rb

@@ -1,4 +1,4 @@
-require "dotpretty/colorers/null"
+require "dotpretty/color_palettes/null"
 require "dotpretty/reporters/basic"
 require "dotpretty/reporters/json"
 require "dotpretty/reporters/names"
@@ -14,12 +14,12 @@ module Dotpretty
           return Dotpretty::Reporters::Json.new(options.fetch(:output))
         when Dotpretty::Reporters::Names::PROGRESS
           return Dotpretty::Reporters::Progress.new({
-            colorer: options.fetch(:colorer),
+            color_palette: options.fetch(:color_palette),
             output: options.fetch(:output)
           })
         else
           return Dotpretty::Reporters::Basic.new({
-            colorer: options.fetch(:colorer),
+            color_palette: options.fetch(:color_palette),
             output: options.fetch(:output)
           })
         end

data/lib/dotpretty/reporters/progress.rb

@@ -2,9 +2,9 @@ module Dotpretty
   module Reporters
     class Progress
 
-      def initialize(colorer:, output:)
-        self.colorer = colorer
-        self.extend(colorer)
+      def initialize(color_palette:, output:)
+        self.color_palette = color_palette
+        self.extend(color_palette)
         self.failing_tests = []
         self.skipped_test_names = []
         self.output = output
@@ -56,7 +56,7 @@ module Dotpretty
 
       def formatted_test_summary(summary)
         return Dotpretty::Reporters::TestSummaryFormatter.new({
-          colorer: colorer,
+          color_palette: color_palette,
           summary: summary
         }).colored_message
       end
@@ -84,7 +84,7 @@ module Dotpretty
         output.puts("")
       end
 
-      attr_accessor :colorer, :failing_tests, :output, :skipped_test_names
+      attr_accessor :color_palette, :failing_tests, :output, :skipped_test_names
 
     end
   end

data/lib/dotpretty/reporters/test_summary_formatter.rb

@@ -2,8 +2,8 @@ module Dotpretty
   module Reporters
     class TestSummaryFormatter
 
-      def initialize(colorer:, summary:)
-        self.extend(colorer)
+      def initialize(color_palette:, summary:)
+        self.extend(color_palette)
         self.summary = summary
       end
 

data/lib/dotpretty/runner.rb

@@ -4,10 +4,10 @@ require "dotpretty/reporters/factory"
 module Dotpretty
   class Runner
 
-    def initialize(colorer:, output:, reporter_name:)
+    def initialize(color_palette:, output:, reporter_name:)
       reporter = Dotpretty::Reporters::Factory.build_reporter(reporter_name, {
         output: output,
-        colorer: colorer
+        color_palette: color_palette
       })
       self.parser = Dotpretty::Parser.new({ reporter: reporter })
     end

data/lib/dotpretty/state_machine/state_details.rb

@@ -0,0 +1,26 @@
+module Dotpretty
+  module StateMachine
+    class StateDetails
+
+      def initialize(transitions:, exit_action:, entry_action:)
+        self.entry_action = entry_action
+        self.exit_action = exit_action
+        self.transitions = transitions
+      end
+
+      attr_reader :entry_action
+
+
+      def trigger(event, &block)
+        transition = transitions[event]
+        block.call(transition, exit_action) if transition
+      end
+
+      private
+
+      attr_accessor :exit_action, :transitions
+      attr_writer :entry_action
+
+    end
+  end
+end

data/lib/dotpretty/state_machine/state_machine.rb

@@ -0,0 +1,45 @@
+require "dotpretty/state_machine/state_details"
+
+module Dotpretty
+  module StateMachine
+    class StateMachine
+
+      def initialize(initial_state:, observer:, states:)
+        self.current_state_name = initial_state
+        self.observer = observer
+        self.states = states
+      end
+
+      attr_reader :current_state_name
+
+      def trigger(event, *args)
+        current_state.trigger(event) do |transition, exit_action|
+          perform(exit_action, *args) if current_state_name != transition[:next_state_name]
+          perform(transition[:action], *args)
+          if current_state_name != transition[:next_state_name]
+            self.current_state_name = transition[:next_state_name]
+            perform(current_state.entry_action, *args)
+          end
+        end
+      end
+
+      private
+
+      def perform(action, *args)
+        observer.send(action, *args) if action
+      end
+
+      def current_state
+        states[current_state_name] || StateDetails.new({
+          entry_action: nil,
+          exit_action: nil,
+          transitions: {}
+        })
+      end
+
+      attr_accessor :observer, :states
+      attr_writer :current_state_name
+
+    end
+  end
+end

data/lib/dotpretty/state_machine/state_machine_builder.rb

@@ -0,0 +1,80 @@
+require "dotpretty/state_machine/state_details"
+require "dotpretty/state_machine/state_machine"
+
+module Dotpretty
+  module StateMachine
+    class StateMachineBuilder
+      class StateDetailsBuilder
+
+        def self.build(name, &definition)
+          builder = StateDetailsBuilder.new(name)
+          builder.instance_eval(&definition)
+          return builder.build
+        end
+
+        def initialize(name)
+          self.name = name
+          self.transitions = {}
+        end
+
+        def build
+          StateDetails.new({
+            entry_action: entry_action,
+            exit_action: exit_action,
+            transitions: transitions
+          })
+        end
+
+        def transition(event, next_state_name, action = nil)
+          transitions[event] = {
+            action: action,
+            next_state_name: next_state_name
+          }
+        end
+
+        def on_entry(action)
+          self.entry_action = action
+        end
+
+        def on_exit(action)
+          self.exit_action = action
+        end
+
+        private
+
+        attr_accessor :entry_action, :exit_action, :name, :transitions
+
+      end
+
+      def self.build(observer, &definition)
+        builder = Dotpretty::StateMachine::StateMachineBuilder.new(observer)
+        builder.instance_eval(&definition)
+        return builder.build
+      end
+
+      def initialize(observer)
+        self.observer = observer
+        self.states = {}
+      end
+
+      def state(name, &definition)
+        state = StateDetailsBuilder.build(name, &definition)
+        states[name] = state
+        self.initial_state = name if !initial_state
+      end
+
+      def build
+        Dotpretty::StateMachine::StateMachine.new({
+          initial_state: initial_state,
+          observer: observer,
+          states: states
+        })
+      end
+
+      private
+
+      attr_accessor :initial_state, :observer, :states
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotpretty
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Eric Meyer
@@ -18,10 +18,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/dotpretty
-- lib/dotpretty.rb
 - lib/dotpretty/aggregator.rb
-- lib/dotpretty/colorers/bash.rb
-- lib/dotpretty/colorers/null.rb
+- lib/dotpretty/color_palettes/bash.rb
+- lib/dotpretty/color_palettes/null.rb
 - lib/dotpretty/parser.rb
 - lib/dotpretty/reporters/basic.rb
 - lib/dotpretty/reporters/factory.rb
@@ -30,9 +29,9 @@ files:
 - lib/dotpretty/reporters/progress.rb
 - lib/dotpretty/reporters/test_summary_formatter.rb
 - lib/dotpretty/runner.rb
-- lib/dotpretty/state_details.rb
-- lib/dotpretty/state_machine.rb
-- lib/dotpretty/state_machine_builder.rb
+- lib/dotpretty/state_machine/state_details.rb
+- lib/dotpretty/state_machine/state_machine.rb
+- lib/dotpretty/state_machine/state_machine_builder.rb
 homepage: https://github.com/ericmeyer/dotpretty
 licenses:
 - MIT

data/lib/dotpretty/state_details.rb

@@ -1,23 +0,0 @@
-module Dotpretty
-  class StateDetails
-
-    def initialize(transitions:, exit_action:, entry_action:)
-      self.entry_action = entry_action
-      self.exit_action = exit_action
-      self.transitions = transitions
-    end
-
-    attr_reader :entry_action
-
-    def trigger(event, &block)
-      transition = transitions[event]
-      block.call(transition, exit_action) if transition
-    end
-
-    private
-
-    attr_accessor :exit_action, :transitions
-    attr_writer :entry_action
-
-  end
-end

data/lib/dotpretty/state_machine.rb

@@ -1,43 +0,0 @@
-require "dotpretty/state_details"
-
-module Dotpretty
-  class StateMachine
-
-    def initialize(initial_state:, observer:, states:)
-      self.current_state_name = initial_state
-      self.observer = observer
-      self.states = states
-    end
-
-    attr_reader :current_state_name
-
-    def trigger(event, *args)
-      current_state.trigger(event) do |transition, exit_action|
-        perform(exit_action, *args) if current_state_name != transition[:next_state_name]
-        perform(transition[:action], *args)
-        if current_state_name != transition[:next_state_name]
-          self.current_state_name = transition[:next_state_name]
-          perform(current_state.entry_action, *args)
-        end
-      end
-    end
-
-    private
-
-    def perform(action, *args)
-      observer.send(action, *args) if action
-    end
-
-    def current_state
-      states[current_state_name] || StateDetails.new({
-        entry_action: nil,
-        exit_action: nil,
-        transitions: {}
-      })
-    end
-
-    attr_accessor :observer, :states
-    attr_writer :current_state_name
-
-  end
-end

data/lib/dotpretty/state_machine_builder.rb

@@ -1,79 +0,0 @@
-require "dotpretty/state_details"
-require "dotpretty/state_machine"
-
-module Dotpretty
-  class StateMachineBuilder
-
-    class StateDetailsBuilder
-
-      def self.build(name, &definition)
-        builder = StateDetailsBuilder.new(name)
-        builder.instance_eval(&definition)
-        return builder.build
-      end
-
-      def initialize(name)
-        self.name = name
-        self.transitions = {}
-      end
-
-      def build
-        StateDetails.new({
-          entry_action: entry_action,
-          exit_action: exit_action,
-          transitions: transitions
-        })
-      end
-
-      def transition(event, next_state_name, action = nil)
-        transitions[event] = {
-          action: action,
-          next_state_name: next_state_name
-        }
-      end
-
-      def on_entry(action)
-        self.entry_action = action
-      end
-
-      def on_exit(action)
-        self.exit_action = action
-      end
-
-      private
-
-      attr_accessor :entry_action, :exit_action, :name, :transitions
-
-    end
-
-    def self.build(observer, &definition)
-      builder = Dotpretty::StateMachineBuilder.new(observer)
-      builder.instance_eval(&definition)
-      return builder.build
-    end
-
-    def initialize(observer)
-      self.observer = observer
-      self.states = {}
-    end
-
-    def state(name, &definition)
-      state = StateDetailsBuilder.build(name, &definition)
-      states[name] = state
-      self.initial_state = name if !initial_state
-    end
-
-    def build
-      Dotpretty::StateMachine.new({
-        initial_state: initial_state,
-        observer: observer,
-        states: states
-      })
-    end
-
-    private
-
-    attr_accessor :initial_state, :observer, :states
-
-  end
-end

data/lib/dotpretty.rb

@@ -1 +0,0 @@
-require "dotpretty/parser"