coloration 0.2.1 → 0.2.2

data/README.md

@@ -0,0 +1,27 @@
+# Coloration
+
+## About
+
+__Coloration__ is editor/IDE color scheme converter. Right now it allows you to convert your favourite Textmate color
+scheme (in XML plist format) to Vim, JEdit and KDevelop/Kate/Kwrite color scheme. It tries to do its best to generate the most accurate 
+result for given target.
+
+## Installation && Usage
+
+You can use Coloration in two ways: online or on your local machine. Online version is available 
+at [coloration.sickill.net](http://coloration.sickill.net/). If you like to install coloration on your own machine to 
+do some batch conversion or for some other reason just run:
+
+    gem install coloration
+
+It gives you _tm2vim_, _tm2jedit_ and _tm2katepart_ binaries to do the conversion on command line.
+
+## Contact
+
+If you found a bug or want to look at the source code you should go to [githubs](http://github.com/sickill/coloration).
+Also if you tried to convert a theme and coloration failed or result is not quite good, please report an issue 
+at [issue tracker](http://github.com/sickill/coloration/issues).
+
+## Author
+
+Coloration was created by Marcin Kulik ([sickill.net](http://sickill.net/))

data/lib/coloration/style.rb

@@ -1,7 +1,7 @@
 module Coloration
 
   class Style
-    attr_accessor :foreground, :background, :bold, :italic, :underline, :strike, :inverse
+    attr_accessor :foreground, :background, :bold, :italic, :underline, :strike, :inverse, :comment
 
     def initialize(obj=nil, bg=nil)
       if obj
@@ -16,15 +16,15 @@ module Coloration
 
     def initialize_from_hash(h, bg=nil)
       h.each do |key, value|
-        if value.is_a?(String)
-          value = Color::RGBA.from_html(value, bg)
-        end
         if key == :fg
           key = :foreground
         end
         if key == :bg
           key = :background
         end
+        if ["foreground", "background"].include?(key.to_s) && value.is_a?(String)
+          value = Color::RGBA.from_html(value, bg)
+        end
         send("#{key}=", value)
       end
     end

data/lib/coloration/version.rb

@@ -1,3 +1,3 @@
 module Coloration
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.2".freeze
 end

data/lib/coloration/writers/vim_theme_writer.rb

@@ -19,7 +19,7 @@ module Coloration
 
         default_style = Style.new(:fg => @ui["foreground"])
         search_style = @items["variable"] || @items["entity"] || @items["keyword"] || default_style
-        border_color = @ui["background"].lighten_by(81)
+        border_color = @ui["background"].mix_with(@ui["foreground"], 81)
 
         ui_mapping = {
           "Cursor" => Style.new(:bg => @ui["caret"]),

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Marcin Kulik