iterm2mintty 0.0.3 → 0.0.4.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2680e29622eb149bbbc5bae9a08e1151407b06a
-  data.tar.gz: 9f02585fe9a8597ae2100387fadd2f88a332028b
+  metadata.gz: 335b699de480a3940a7c7fec515461c382f08052
+  data.tar.gz: 24da084225bd5c636b816e92a993ec3ccde7bb4a
 SHA512:
-  metadata.gz: 6e8458bd3e3bf82715a255c2d9542234df8b5b64d02d4385468ece9c1083de60e2f34a24d2194b5d39788a94a562b3bf7b08e321292df91c3424649ac5b39149
-  data.tar.gz: 89d56d564b69171b892d8d70dec5f0988f5098a6ee54506e071578395bfe032452d5e39d67ec2cb63772421f6ef33cab70bb235839dcba6f7984a9ea5db5b7f9
+  metadata.gz: f6129285ba36bcc9d238c5184c779973196dc61462356c88bae879a4cd8c1005a8229dcf35f57d8c997390997f85572cf313e2bebc092ab95fbd4ad9d2319e58
+  data.tar.gz: 24a67fc639f6c534dd36ba0256dcd9703f14d151f2e2bf16fc2d0d0808f4ecc5ed3d0cca631c439e963ea1c88b1436f933b64e97fbfe84b4deb5de2ba945016a

data/README.md

@@ -21,11 +21,23 @@ Or install it yourself as:
 
 ## Usage
 
+Iterm2mintty default writes to stdout. To use, try:
+
 ```
 iterm2mintty somecolorscheme.itermcolors
 ```
 
-Should output a .minttyrc file in whatever directory you ran it in.
+Or maybe even:
+
+```
+iterm2mintty somecolorscheme.itermcolors > .minttyrc
+```
+
+If you'd like to write the output to a file, use the `-o` flag (defaults to .minttyrc)
+
+```
+iterm2mintty somecolorscheme.itermcolors -o some/path/to/.minttyrc
+```
 
 ## Contributing
 

data/Rakefile

@@ -3,6 +3,7 @@ require "rake/testtask"
 
 Rake::TestTask.new do |t|
   t.libs << "test"
+  t.verbose = true
 end
 
 desc "Run tests"

data/bin/iterm2mintty

@@ -1,15 +1,7 @@
 #!/usr/bin/env ruby
 
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+Signal.trap("INT") { exit false }
 
-Signal.trap("INT") { exit 1 }
+require "iterm2mintty/cli"
 
-require "iterm2mintty"
-require "pathname"
-
-file = Pathname.new(ARGV[0])
-
-File.open("./.minttyrc", "w") do |f|
-  f.write Iterm2mintty.new(pathname: file).convert
-end
+Iterm2mintty::CLI.run(ARGV.dup)

data/iterm2mintty.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = "~> 2.1"
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 

data/lib/iterm2mintty/cli.rb

@@ -0,0 +1,80 @@
+require "optparse"
+require "pathname"
+require "iterm2mintty"
+require "iterm2mintty/version"
+
+module Iterm2mintty
+  class CLI
+    attr_reader :args, :io, :source
+
+    def self.run(args)
+      new(args).run
+    end
+
+    def initialize(args, io: $stdout)
+      @args = args
+      @io = io
+    end
+
+    def run
+      parse_options
+
+      io.puts Iterm2mintty.convert(source)
+
+      if io.close_on_exec?
+        io.close
+      end
+    end
+
+    def parse_options
+      parser = OptionParser.new do |opts|
+        opts.banner = "Usage: iterm2mintty <source filepath> [options]"
+        opts.separator ""
+        opts.separator "Options:"
+
+        opts.on(
+          "-o",
+          "--output [FILE]",
+          "FILE to output theme to (defaults to .minttyrc)"
+        ) do |path|
+          path ||= ".minttyrc"
+          @io = File.new(path, "w")
+        end
+
+        opts.on("-v", "--version", "Prints version of Iterm2mintty") do
+          puts VERSION
+          exit true
+        end
+
+        opts.on("-h", "--help", "Prints this help :)") do
+          puts opts
+
+          if io.close_on_exec?
+            io.close
+          end
+
+          exit true
+        end
+      end
+
+      parser.parse!(args)
+
+      if args.empty?
+        puts parser
+
+        if io.close_on_exec?
+          io.close
+        end
+
+        exit false
+      else
+        @source = Pathname.new(args.pop)
+
+        unless @source.exist?
+          puts "Source file \"#{@source}\" does not exist."
+          exit false
+        end
+      end
+    end
+  end
+end

data/lib/iterm2mintty/converter.rb

@@ -0,0 +1,18 @@
+require "iterm2mintty/mintty_theme"
+require "iterm2mintty/iterm2_theme"
+
+module Iterm2mintty
+  class Converter
+    attr_reader :to, :from
+
+    def initialize(to: MinttyTheme.new, from: Iterm2Theme.new)
+      @to   = to
+      @from = from
+    end
+
+    def call(source)
+      to.components = from.from_source(source).components
+      to.output
+    end
+  end
+end

data/lib/iterm2mintty/iterm2_theme.rb

@@ -0,0 +1,12 @@
+require "iterm2mintty/theme"
+require "iterm2mintty/iterm2_theme_parser"
+
+module Iterm2mintty
+  class Iterm2Theme < Theme
+    def from_source(itermcolors)
+      @components = Iterm2ThemeParser.new(itermcolors).build
+      self
+    end
+  end
+end
+

data/lib/iterm2mintty/iterm2_theme_parser.rb

@@ -0,0 +1,46 @@
+require "iterm2mintty/theme_component"
+require "plist"
+
+module Iterm2mintty
+  class Iterm2ThemeParser
+    attr_reader :itermcolors
+
+    def initialize(itermcolors)
+      @itermcolors = itermcolors
+    end
+
+    def build
+      parsed_theme.map do |k, v|
+        case k
+        when /Ansi (\d+) Color/
+          ThemeComponent.ansi(Integer($1))
+        when "Background Color"
+          BGColorComponent
+        when "Foreground Color"
+          FGColorComponent
+        when "Cursor Color"
+          CursorColorComponent
+        else
+          # TODO(bobcats): Probably good candidate for NullComponent
+          next
+        end.new(red(v), green(v), blue(v))
+      end.compact
+    end
+
+    def red(value)
+      Integer(value.fetch("Red Component").to_f * 255)
+    end
+
+    def green(value)
+      Integer(value.fetch("Green Component").to_f * 255)
+    end
+
+    def blue(value)
+      Integer(value.fetch("Blue Component").to_f * 255)
+    end
+
+    def parsed_theme
+      Plist.parse_xml(itermcolors)
+    end
+  end
+end

data/lib/iterm2mintty/mintty_theme.rb

@@ -0,0 +1,43 @@
+require "iterm2mintty/theme"
+
+module Iterm2mintty
+  class MinttyTheme < Theme
+    def output
+      output_lines.join("\n") + "\n"
+    end
+
+    def output_lines
+      components.map do |component|
+        component_to_config(component)
+      end
+    end
+
+    def component_to_config(component)
+      "#{key_for(component.class)}= #{component.red}, #{component.green}, #{component.blue}"
+    end
+
+    def key_for(component_class)
+      {
+        BlackComponent => "Black",
+        RedComponent => "Red",
+        GreenComponent => "Green",
+        YellowComponent => "Yellow",
+        BlueComponent => "Blue",
+        MagentaComponent => "Magenta",
+        CyanComponent => "Cyan",
+        WhiteComponent => "White",
+        BoldBlackComponent => "BoldBlack",
+        BoldRedComponent => "BoldRed",
+        BoldGreenComponent => "BoldGreen",
+        BoldYellowComponent => "BoldYellow",
+        BoldBlueComponent => "BoldBlue",
+        BoldMagentaComponent => "BoldMagenta",
+        BoldCyanComponent => "BoldCyan",
+        BoldWhiteComponent => "BoldWhite",
+        BGColorComponent => "BackgroundColour",
+        FGColorComponent => "ForegroundColour",
+        CursorColorComponent => "CursorColour",
+      }[component_class]
+    end
+  end
+end

data/lib/iterm2mintty/theme.rb

@@ -0,0 +1,9 @@
+module Iterm2mintty
+  class Theme
+    attr_accessor :components
+
+    def initialize(components = Array.new)
+      @components = components
+    end
+  end
+end

data/lib/iterm2mintty/theme_component.rb

@@ -0,0 +1,44 @@
+module Iterm2mintty
+  class ThemeComponent < Struct.new(:red, :green, :blue)
+    def self.ansi(index)
+      [
+        BlackComponent,
+        RedComponent,
+        GreenComponent,
+        YellowComponent,
+        BlueComponent,
+        MagentaComponent,
+        CyanComponent,
+        WhiteComponent,
+        BoldBlackComponent,
+        BoldRedComponent,
+        BoldGreenComponent,
+        BoldYellowComponent,
+        BoldBlueComponent,
+        BoldMagentaComponent,
+        BoldCyanComponent,
+        BoldWhiteComponent,
+      ][index]
+    end
+  end
+
+  class BlackComponent < ThemeComponent; end
+  class RedComponent < ThemeComponent; end
+  class GreenComponent < ThemeComponent; end
+  class YellowComponent < ThemeComponent; end
+  class BlueComponent < ThemeComponent; end
+  class MagentaComponent < ThemeComponent; end
+  class CyanComponent < ThemeComponent; end
+  class WhiteComponent < ThemeComponent; end
+  class BoldBlackComponent < ThemeComponent; end
+  class BoldRedComponent < ThemeComponent; end
+  class BoldGreenComponent < ThemeComponent; end
+  class BoldYellowComponent < ThemeComponent; end
+  class BoldBlueComponent < ThemeComponent; end
+  class BoldMagentaComponent < ThemeComponent; end
+  class BoldCyanComponent < ThemeComponent; end
+  class BoldWhiteComponent < ThemeComponent; end
+  class BGColorComponent < ThemeComponent; end
+  class FGColorComponent < ThemeComponent; end
+  class CursorColorComponent < ThemeComponent; end
+end

data/lib/iterm2mintty/version.rb

@@ -1,3 +1,3 @@
-class Iterm2mintty
-  VERSION = "0.0.3"
+module Iterm2mintty
+  VERSION = "0.0.4.pre"
 end

data/lib/iterm2mintty.rb

@@ -1,127 +1,7 @@
-require "iterm2mintty/version"
-require "plist"
+require "iterm2mintty/converter"
 
-class Iterm2mintty
-  attr_reader :pathname, :ansi_colors
-
-  def initialize(pathname:)
-    @pathname = pathname
-  end
-
-  def convert
-    ansi_colors.map do |color|
-      color.to_mintty + "\n"
-    end.join
-  end
-
-  def ansi_colors
-    parsed_theme.map do |k, v|
-      red = Integer(v["Red Component"] * 255)
-      green = Integer(v["Green Component"] * 255)
-      blue = Integer(v["Blue Component"] * 255)
-      color = Color.new(red, green, blue)
-
-      case k
-      when /Ansi/
-        number = Integer(k.match(/\d+/)[0])
-        ANSIColor.new(number: number, color: color)
-      when "Background Color"
-        BGColor.new(color: color)
-      when "Foreground Color"
-        FGColor.new(color: color)
-      when "Cursor Color"
-        CursorColor.new(color: color)
-      end
-    end.compact
-  end
-
-  def parsed_theme
-    Plist.parse_xml(pathname)
-  end
-end
-
-module Iterm2mintty::MinttyColor
-  def to_mintty
-    "#{name}= #{red}, #{green}, #{blue}"
-  end
-end
-
-module Iterm2mintty::Colorable
-  def red
-    color.r
-  end
-
-  def green
-    color.g
-  end
-
-  def blue
-    color.b
-  end
-end
-
-class Iterm2mintty::ANSIColor
-  include Iterm2mintty::MinttyColor
-  include Iterm2mintty::Colorable
-
-  attr_reader :number, :color
-
-  NAMES = %w(
-    Black     Red     Green     Yellow     Blue     Magenta     Cyan     White
-    BoldBlack BoldRed BoldGreen BoldYellow BoldBlue BoldMagenta BoldCyan BoldWhite
-  )
-
-  def initialize(number:, color:)
-    @number = number
-    @color = color
-  end
-
-  def name
-    NAMES[number]
-  end
-end
-
-class Iterm2mintty::FGColor
-  include Iterm2mintty::MinttyColor
-  include Iterm2mintty::Colorable
-  attr_reader :color
-
-  def initialize(color:)
-    @color = color
-  end
-
-  def name
-    "ForegroundColour"
+module Iterm2mintty
+  def self.convert(source)
+    Converter.new.call(source)
   end
 end
-
-class Iterm2mintty::BGColor
-  include Iterm2mintty::MinttyColor
-  include Iterm2mintty::Colorable
-  attr_reader :color
-
-  def initialize(color:)
-    @color = color
-  end
-
-  def name
-    "BackgroundColour"
-  end
-end
-
-class Iterm2mintty::CursorColor
-  include Iterm2mintty::MinttyColor
-  include Iterm2mintty::Colorable
-  attr_reader :color
-
-  def initialize(color:)
-    @color = color
-  end
-
-  def name
-    "CursorColour"
-  end
-end
-
-class Iterm2mintty::Color < Struct.new(:r, :g, :b)
-end

data/test/helper.rb

@@ -0,0 +1,2 @@
+require "minitest/autorun"
+require "iterm2mintty"

data/test/test_cli.rb

@@ -0,0 +1,16 @@
+require "helper"
+require "iterm2mintty/cli"
+
+module Iterm2mintty
+  class CLITest < MiniTest::Test
+    def test_run
+      io = MiniTest::Mock.new
+      args = ["test/fixtures/Hybrid.itermcolors"]
+
+      io.expect("puts", String.new, [String])
+      io.expect("close_on_exec?", false)
+
+      CLI.new(args, io: io).run
+    end
+  end
+end

data/test/test_converter.rb

@@ -0,0 +1,28 @@
+require "helper"
+require "iterm2mintty/converter"
+
+module Iterm2mintty
+  class ConverterTest < MiniTest::Test
+    def setup
+      @to = MiniTest::Mock.new
+      @from = MiniTest::Mock.new
+      @source = MiniTest::Mock.new
+      @theme_components = [ThemeComponent.new]
+
+      @converter = Converter.new(to: @to, from: @from)
+    end
+
+    def test_call
+      @to.expect(:output, String.new)
+      @to.expect(:components=, @to, [@theme_components])
+
+      @from.expect(:components, @theme_components)
+      @from.expect(:from_source, @from, [@source])
+
+      @converter.call(@source)
+
+      assert @to.verify
+      assert @from.verify
+    end
+  end
+end

data/test/test_iterm2_theme.rb

@@ -0,0 +1,53 @@
+require "helper"
+require "iterm2mintty/iterm2_theme_parser"
+
+module Iterm2mintty
+  class Iterm2ThemeParserTest < MiniTest::Test
+    def setup
+      itermcolors = Pathname.new("test/fixtures/Hybrid.itermcolors")
+      @parser = Iterm2ThemeParser.new(itermcolors)
+    end
+
+    def test_build
+      built_components = @parser.build
+      components = [
+        BlackComponent.new(42, 46, 51),
+        RedComponent.new(183, 77, 80),
+        BoldGreenComponent.new(120, 131, 49),
+        BoldYellowComponent.new(229, 137, 79),
+        BoldBlueComponent.new(75, 107, 136),
+        BoldMagentaComponent.new(110, 79, 121),
+        BoldCyanComponent.new(77, 123, 115),
+        BoldWhiteComponent.new(90, 97, 105),
+        GreenComponent.new(179, 190, 90),
+        YellowComponent.new(227, 181, 94),
+        BlueComponent.new(109, 144, 176),
+        MagentaComponent.new(160, 126, 171),
+        CyanComponent.new(127, 190, 179),
+        WhiteComponent.new(181, 184, 182),
+        BoldBlackComponent.new(29, 30, 33),
+        BoldRedComponent.new(140, 45, 50),
+        BGColorComponent.new(22, 23, 24),
+        CursorColorComponent.new(183, 188, 185),
+        FGColorComponent.new(183, 188, 185),
+      ]
+
+      assert_equal components, built_components
+    end
+
+    def test_red
+      red = @parser.red({"Red Component" => "1.0"})
+      assert_equal red, 255
+    end
+
+    def test_green
+      green = @parser.green({"Green Component" => "1.0"})
+      assert_equal green, 255
+    end
+
+    def test_blue
+      blue = @parser.blue({"Blue Component" => "1.0"})
+      assert_equal blue, 255
+    end
+  end
+end

data/test/test_iterm2mintty.rb

@@ -1,12 +1,8 @@
-require "minitest/autorun"
-require "iterm2mintty"
-require "pathname"
+require "helper"
 
 class Iterm2minttyTest < MiniTest::Test
   def setup
-    @i22m = Iterm2mintty.new(
-      pathname: Pathname.new("test/Hybrid.itermcolors")
-    )
+    @path = Pathname.new("test/fixtures/Hybrid.itermcolors")
   end
 
   def test_convert
@@ -33,22 +29,6 @@ CursorColour= 183, 188, 185
 ForegroundColour= 183, 188, 185
     MINTTYRC
 
-    assert_equal minttyrc, @i22m.convert
-  end
-end
-
-class Iterm2mintty
-  class ANSIColorTest < MiniTest::Test
-    def setup
-      @black = ANSIColor.new(number: 0, color: Color.new(0, 0, 0))
-    end
-
-    def test_name
-      assert_equal "Black", @black.name
-    end
-
-    def test_to_mintty
-      assert_equal "Black= 0, 0, 0", @black.to_mintty
-    end
+    assert_equal minttyrc, Iterm2mintty.convert(@path)
   end
 end

data/test/test_mintty_theme.rb

@@ -0,0 +1,64 @@
+require "helper"
+require "iterm2mintty/mintty_theme"
+
+module Iterm2mintty
+  class MinttyThemeTest < MiniTest::Test
+    def setup
+      @components = [
+        BlackComponent.new(0, 0, 0),
+        RedComponent.new(170, 0, 0),
+        GreenComponent.new(0, 170, 0),
+        YellowComponent.new(170, 85, 0),
+        BlueComponent.new(0, 0, 170),
+        MagentaComponent.new(170, 0, 170),
+        CyanComponent.new(0, 170, 170),
+        WhiteComponent.new(170, 170, 170),
+        BoldBlackComponent.new(85, 85, 85),
+        BoldRedComponent.new(255, 85, 85),
+        BoldGreenComponent.new(85, 255, 85),
+        BoldYellowComponent.new(255, 255, 85),
+        BoldBlueComponent.new(85, 85, 255),
+        BoldMagentaComponent.new(255, 85, 255),
+        BoldCyanComponent.new(85, 255, 255),
+        BoldWhiteComponent.new(255, 255, 255),
+        BGColorComponent.new(0, 0, 0),
+        FGColorComponent.new(255, 255, 255),
+        CursorColorComponent.new(255, 255, 255)
+      ]
+
+      @mintty_theme = MinttyTheme.new(@components)
+    end
+
+    def test_component_to_config
+      output_line = MinttyTheme.new.component_to_config(@components.first)
+
+      assert_equal output_line, "Black= 0, 0, 0"
+    end
+
+    def test_output
+      output = <<-OUTPUT
+Black= 0, 0, 0
+Red= 170, 0, 0
+Green= 0, 170, 0
+Yellow= 170, 85, 0
+Blue= 0, 0, 170
+Magenta= 170, 0, 170
+Cyan= 0, 170, 170
+White= 170, 170, 170
+BoldBlack= 85, 85, 85
+BoldRed= 255, 85, 85
+BoldGreen= 85, 255, 85
+BoldYellow= 255, 255, 85
+BoldBlue= 85, 85, 255
+BoldMagenta= 255, 85, 255
+BoldCyan= 85, 255, 255
+BoldWhite= 255, 255, 255
+BackgroundColour= 0, 0, 0
+ForegroundColour= 255, 255, 255
+CursorColour= 255, 255, 255
+      OUTPUT
+
+      assert_equal output, @mintty_theme.output
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iterm2mintty
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4.pre
 platform: ruby
 authors:
 - Brian Field
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,9 +68,21 @@ files:
 - bin/iterm2mintty
 - iterm2mintty.gemspec
 - lib/iterm2mintty.rb
+- lib/iterm2mintty/cli.rb
+- lib/iterm2mintty/converter.rb
+- lib/iterm2mintty/iterm2_theme.rb
+- lib/iterm2mintty/iterm2_theme_parser.rb
+- lib/iterm2mintty/mintty_theme.rb
+- lib/iterm2mintty/theme.rb
+- lib/iterm2mintty/theme_component.rb
 - lib/iterm2mintty/version.rb
-- test/Hybrid.itermcolors
+- test/fixtures/Hybrid.itermcolors
+- test/helper.rb
+- test/test_cli.rb
+- test/test_converter.rb
+- test/test_iterm2_theme.rb
 - test/test_iterm2mintty.rb
+- test/test_mintty_theme.rb
 homepage: http://www.github.com/bobcats/iterm2mintty
 licenses:
 - MIT
@@ -81,20 +93,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tool for converting terminal themes from iTerm2 to mintty
 test_files:
-- test/Hybrid.itermcolors
+- test/fixtures/Hybrid.itermcolors
+- test/helper.rb
+- test/test_cli.rb
+- test/test_converter.rb
+- test/test_iterm2_theme.rb
 - test/test_iterm2mintty.rb
+- test/test_mintty_theme.rb