wasko 0.2.1 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 924d61c3075d832882f4c08739c045b22c7e7703
+  data.tar.gz: 160ed9c759529743fa1305cf1084d0f5a1daecae
+SHA512:
+  metadata.gz: 1866d1d6eae3df475422d734152f2214ed8410c91e4aecf82efbb7ef4b42dcd5890c8d0ea3e6ed8ad4c3b841d56ef4b9dd25c90ba2709b14d8e71cfa3ab269de
+  data.tar.gz: 168c0498c57f392d0fc195981295deea2574248e3cb3f5ef1580d104798af2279be3da50c4243d7053c35c7c2cc0baf4b1e398fa8b05cc9abb700967813204e6

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## 0.2.3
+
+The I-messed-up-with-bundler-and-now-need-to-push-another-version edition.
+
+## 0.2.2
+
+Instead of keeping track of your previous color, setting a palette with a color now just sets the color.
+
+## 0.2.1
+
+One of the earlier version of Wasko

data/Gemfile

@@ -6,17 +6,12 @@ group :development do
   # An IRB alternative and runtime developer console
   # [pry](http://pry.github.com)
   gem 'pry', '~> 0.9.10'
+  # Rake is a Make-like program implemented in Ruby. Tasks and dependenci...
+  # [rake](https://github.com/jimweirich/rake)
+  gem 'rake', '~> 10.3.2'
 end
 
 group :test do
-  # Adding rake for Travis.
-  gem 'rake'
-
-  # Making tests easy on the fingers and eyes
-  # [shoulda](https://github.com/thoughtbot/shoulda)
-  gem 'shoulda', '~> 3.1.1'
-
-  # Mocking and stubbing library
-  # [mocha](http://gofreerange.com/mocha/docs)
-  gem 'mocha', '~> 0.12.4'
+  gem 'minitest', '~> 5.3.2'
+  gem 'mocha', '~> 1.0.0'
 end

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    wasko (0.2.1)
+    wasko (0.2.3)
       color
+      rake
       thor
-      thor (~> 0.15.4)
 
 GEM
   remote: http://rubygems.org/
@@ -13,18 +13,19 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     coderay (1.0.7)
-    color (1.4.1)
+    color (1.7)
     i18n (0.6.1)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     method_source (0.8)
-    mocha (0.12.4)
+    minitest (5.3.4)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    rake (0.8.7)
+    rake (10.3.2)
     shoulda (3.1.1)
       shoulda-context (~> 1.0)
       shoulda-matchers (~> 1.2)
@@ -38,8 +39,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  mocha (~> 0.12.4)
+  minitest (~> 5.3.2)
+  mocha (~> 1.0.0)
   pry (~> 0.9.10)
-  rake
-  shoulda (~> 3.1.1)
+  rake (~> 10.3.2)
+  shoulda
   wasko!

data/README.mdown

@@ -6,7 +6,7 @@ _The quickest way to set your Terminal palette._
 
 I have a weird habit of having open too many Terminal windows that all look the same, so I needed a way to quickly make them different. Enter: Wasko.
 
-With wasko you can quickly change the background color of an open Terminal window, it does this by taking your desired color and mixing it with your default background color. So it doesn't look completely like someone vomited and then made a color scheme out of it (although if it does, try a different color).
+With wasko you can quickly change the background color of an open Terminal window, it does this by taking your desired color and trying to get other colors that kinda match it. So it shouldn't look like someone vomited and then made a color scheme out of it (although if it does, try a different color).
 
 ## How does it work?
 
@@ -14,7 +14,7 @@ If you just enter `wasko` it'll show you all available options (thanks to [thor]
 
 The one I use most is:
 
-* `wasko -b red` which will update the background color. You can enter any valid css color, the world is your coloured oyster.
+* `wasko -p red` which will update the background color, and font colors. You can enter any valid css color, the world is your coloured oyster.
 
 You can also change the font etc, see the help for more:
 
@@ -33,6 +33,4 @@ You can also change the font etc, see the help for more:
 
 #@ Copyright
 
-
-Copyright (c) 2011 pjaspers. See LICENSE.txt for
-further details.
+Copyright (c) 201[0-9] pjaspers. See LICENSE.txt for further details.

data/Rakefile

@@ -1,18 +1,17 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
-require 'rake/testtask'
 
-desc 'Run Devise unit tests.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/test_*.rb'
-  t.verbose = true
+task :test do
+  $LOAD_PATH.unshift('lib', 'test')
+  Dir.glob('./test/**/test_*.rb') { |f| require f }
 end
 
 task :default => :test
 
 desc "Open an pry session with Gasoline loaded"
 task :console do
-  sh "pry -I lib -r wasko.rb"
+  require 'pry'
+  require './lib/wasko'
+  ARGV.clear
+  Pry.start Wasko
 end

data/bin/wasko

@@ -15,6 +15,7 @@ module Wasko
     map "-t" => :text
     map "-f" => :font
     map "-s" => :strong
+    map "-p" => :palette
 
     desc "text COLOR", "-t, Gets/sets text color"
     def text(color_name="")
@@ -47,6 +48,19 @@ module Wasko
       end
     end
 
+    desc "palette COLOR", "-p, Gets/sets background color"
+    def palette(color_name="")
+      if color_name.empty?
+        say Wasko.palette
+      else
+        if Wasko::Color.color_from_string(color_name)
+          Wasko.set_palette color_name
+        else
+          error "#{color_name} is not a color."
+        end
+      end
+    end
+
     desc "cursor COLOR", "-c, Gets/sets cursor color"
     def cursor(color_name="")
       if color_name.empty?

data/lib/wasko.rb

@@ -1,5 +1,10 @@
+# coding: utf-8
+
 require "color/palette/monocontrast"
 require "yaml"
+
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
 # [Applescript: Small wrapper for running applescript](applescript.html)
 require "wasko/applescript"
 # [Terminal: Support for Terminal.app](terminal.html)
@@ -10,6 +15,7 @@ require "wasko/iterm"
 require "wasko/color"
 # [Palette: Generates a color scheme](palette.html)
 require "wasko/palette"
+require "wasko/palettes/original"
 # [Configuration: Loading and saving themes](configuration.html)
 require "wasko/configuration"
 
@@ -23,7 +29,7 @@ module Wasko
       return Wasko::Terminal if current_application =~ /Terminal.app/
       return Wasko::Iterm if current_application =~ /iTerm.app/
       # Fall back to Terminal for CI
-      return Wasko::Terminal
+      Wasko::Terminal
     end
 
     # Gets the current active application
@@ -49,10 +55,8 @@ module Wasko
     #
     # Sets the background color
     def set_background_color(color)
-      original_background = ::Color::RGB.from_applescript(advanced_typing_apparatus.startup_background_color).html
-      palette = Wasko::Palette::TheOriginal.new(original_background)
-      new_color = palette.base_color_with_tint(color)
-      advanced_typing_apparatus.set_background_color(new_color.to_applescript)
+      color = Wasko::Color.color_from_string(color)
+      advanced_typing_apparatus.set_background_color(color.to_applescript)
     end
 
     def foreground_color
@@ -162,7 +166,7 @@ module Wasko
 
     # Try to set a sensible palette from a base color
     def set_palette(color_string)
-      p = Wasko::Palette::TheOriginal.new(color_string)
+      p = Wasko::Palette::Original.new(color_string)
 
       set_background_color p.colors[:base].html
       set_foreground_color p.colors[:foreground].html

data/lib/wasko/iterm.rb

@@ -2,6 +2,22 @@ module Wasko
   # Adds support for [iTerm2](http://code.google.com/p/iterm2/)
   class Iterm
 
+    def self.normal_text_color
+      foreground_color
+    end
+
+    def self.font_name
+      'Not supported'
+    end
+
+    def self.font_size
+      'Not supported'
+    end
+
+    def self.bold_text_color
+      bold_color
+    end
+
     # Terminal.app uses a slightly different terminology
     def self.set_normal_text_color(color)
       set_foreground_color color

data/lib/wasko/palette.rb

@@ -2,10 +2,7 @@ module Wasko
   # A module aimed at creating color schemes for terminals
   # Pretty straightforward, no?
   module Palette
-    # Since I change my mind pretty frequently on
-    # color schemes etc. Putting the actual logic in
-    # a class so it's easier to extend.
-    class TheOriginal
+    class Base
       # Takes a valid css color string and an optional
       # contrast argument. The contrast is useful to tweak
       # the output of things.
@@ -35,70 +32,6 @@ module Wasko
         p.colors[:yellow]
       end
 
-      # Checks the brightness of the base color and
-      # returns the appropriate opposite color.
-      #
-      # For example black will return white, white will
-      # return black.
-      def opposite_color
-        @base.brightness > 0.5 ? black : white
-      end
-
-      # To calculate colors that will fit our base color
-      # we need to find out to brighten them, or darken
-      # them
-      def inverse_brightness
-        @base.brightness > 0.5 ? -1 : 1
-      end
-
-      def dark_base_color?
-        @base.brightness < 0.5
-      end
-
-      # Hash of the color palette
-      # TODO: attr_accessible
-      def colors
-        @colors
-      end
-
-      # Creates a palette based on the `@base`-color. This
-      # generates a color palette which has taken a good
-      # look at [Solarized](http://ethanschoonover.com/solarized)
-      # The plus side is you can use any base color, the
-      # downside is, the colors won't be picked as well as
-      # when using [Solarized](http://ethanschoonover.com/solarized) so if that's what you need, check it out.
-      def colors!
-        p = {}
-        p[:base]       = @base
-        p[:foreground] = @base.mix_with(opposite_color, @contrast + 18)
-        p[:bold]       = @base.mix_with(opposite_color, @contrast + 19.5)
-        p[:selection]  = @base.adjust_brightness inverse_brightness * @contrast
-        p[:selected]   = p[:bold]
-        p[:cursor]     = p[:foreground]
-
-        # ANSI Colors
-        p[:red]     = mix_base_with("red", 50, inverse_brightness * @contrast)
-        p[:green]   = mix_base_with("green", 50, inverse_brightness * @contrast)
-        p[:yellow]  = mix_base_with("yellow", 50, inverse_brightness * @contrast)
-        p[:white]   = mix_base_with("white", 35, inverse_brightness * @contrast)
-        p[:black]   = mix_base_with("black", 35, inverse_brightness * @contrast)
-        p[:blue]    = mix_base_with("blue", 50, inverse_brightness * (@contrast))
-        p[:magenta] = mix_base_with("#CA1F7B", 35, inverse_brightness * @contrast)
-        p[:cyan]    = mix_base_with("#00FFFF", 50, inverse_brightness * (@contrast - 20))
-        @colors = p
-      end
-
-      # Just a utility method that mixes colors, for more
-      # info on this check the docs of the `color`-gem.
-      def mix_base_with(color_name, mix_value = 50, brightness = 30)
-        @base.mix_with(Wasko::Color.color_from_string(color_name), mix_value).adjust_brightness(brightness)
-      end
-
-
-      def base_color_with_tint(color_name)
-        brightness = inverse_brightness * @contrast
-        mix_base_with(color_name, 80, brightness)
-      end
     end
   end
 end

data/lib/wasko/palettes/original.rb

@@ -0,0 +1,90 @@
+module Wasko
+  # A module aimed at creating color schemes for terminals
+  # Pretty straightforward, no?
+  module Palette
+    # Since I change my mind pretty frequently on
+    # color schemes etc. Putting the actual logic in
+    # a class so it's easier to extend.
+    class Original < Base
+
+      # Returns a `color`-instance of white
+      def white
+        Wasko::Color.color_from_string("white")
+      end
+
+      # Returns a `color`-instance of black
+      def black
+        Wasko::Color.color_from_string("black")
+      end
+
+      def ansi_colors?
+        p.colors[:yellow]
+      end
+
+      # Checks the brightness of the base color and
+      # returns the appropriate opposite color.
+      #
+      # For example black will return white, white will
+      # return black.
+      def opposite_color
+        @base.brightness > 0.5 ? black : white
+      end
+
+      # To calculate colors that will fit our base color
+      # we need to find out to brighten them, or darken
+      # them
+      def inverse_brightness
+        @base.brightness > 0.5 ? -1 : 1
+      end
+
+      def dark_base_color?
+        @base.brightness < 0.5
+      end
+
+      # Hash of the color palette
+      # TODO: attr_accessible
+      def colors
+        @colors
+      end
+
+      # Creates a palette based on the `@base`-color. This
+      # generates a color palette which has taken a good
+      # look at [Solarized](http://ethanschoonover.com/solarized)
+      # The plus side is you can use any base color, the
+      # downside is, the colors won't be picked as well as
+      # when using [Solarized](http://ethanschoonover.com/solarized) so if that's what you need, check it out.
+      def colors!
+        p = {}
+        p[:base]       = @base
+        p[:foreground] = @base.mix_with(opposite_color, @contrast + 0)
+        p[:bold]       = @base.mix_with(opposite_color, @contrast + 5)
+        p[:selection]  = @base.adjust_brightness inverse_brightness * @contrast
+        p[:selected]   = p[:bold]
+        p[:cursor]     = p[:foreground]
+
+        # ANSI Colors
+        p[:red]     = mix_base_with("red", 50, inverse_brightness * @contrast)
+        p[:green]   = mix_base_with("green", 50, inverse_brightness * @contrast)
+        p[:yellow]  = mix_base_with("yellow", 50, inverse_brightness * @contrast)
+        p[:white]   = mix_base_with("white", 35, inverse_brightness * @contrast)
+        p[:black]   = mix_base_with("black", 35, inverse_brightness * @contrast)
+        p[:blue]    = mix_base_with("blue", 50, inverse_brightness * (@contrast))
+        p[:magenta] = mix_base_with("#CA1F7B", 35, inverse_brightness * @contrast)
+        p[:cyan]    = mix_base_with("#00FFFF", 50, inverse_brightness * (@contrast - 20))
+        @colors = p
+      end
+
+      # Just a utility method that mixes colors, for more
+      # info on this check the docs of the `color`-gem.
+      def mix_base_with(color_name, mix_value = 50, brightness = 30)
+        @base.mix_with(Wasko::Color.color_from_string(color_name), mix_value).adjust_brightness(brightness)
+      end
+
+
+      def base_color_with_tint(color_name)
+        brightness = inverse_brightness * @contrast
+        mix_base_with(color_name, 80, brightness)
+      end
+    end
+  end
+end

data/lib/wasko/palettes/plain.rb

@@ -0,0 +1,40 @@
+module Wasko
+  module Palette
+    class Plain < Base
+
+      # Hash of the color palette
+      # TODO: attr_accessible
+      def colors
+        @colors
+      end
+
+      # Creates a palette based on the `@base`-color. This
+      # generates a color palette which has taken a good
+      # look at [Solarized](http://ethanschoonover.com/solarized)
+      # The plus side is you can use any base color, the
+      # downside is, the colors won't be picked as well as
+      # when using [Solarized](http://ethanschoonover.com/solarized) so if that's what you need, check it out.
+      def colors!
+        p = {}
+        p[:base]       = @base
+        p[:foreground] = @base.mix_with(opposite_color, @contrast + 18)
+        p[:bold]       = @base.mix_with(opposite_color, @contrast + 19.5)
+        p[:selection]  = @base.adjust_brightness inverse_brightness * @contrast
+        p[:selected]   = p[:bold]
+        p[:cursor]     = p[:foreground]
+
+        # ANSI Colors
+        p[:red]     = mix_base_with("red", 50, inverse_brightness * @contrast)
+        p[:green]   = mix_base_with("green", 50, inverse_brightness * @contrast)
+        p[:yellow]  = mix_base_with("yellow", 50, inverse_brightness * @contrast)
+        p[:white]   = mix_base_with("white", 35, inverse_brightness * @contrast)
+        p[:black]   = mix_base_with("black", 35, inverse_brightness * @contrast)
+        p[:blue]    = mix_base_with("blue", 50, inverse_brightness * (@contrast))
+        p[:magenta] = mix_base_with("#CA1F7B", 35, inverse_brightness * @contrast)
+        p[:cyan]    = mix_base_with("#00FFFF", 50, inverse_brightness * (@contrast - 20))
+        @colors = p
+      end
+
+    end
+  end
+end

data/lib/wasko/version.rb

@@ -1,3 +1,3 @@
 module Wasko
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/test/helper.rb

@@ -1,19 +1,12 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-require 'mocha'
+# coding: utf-8
+
+require 'minitest'
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'mocha/setup'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'wasko'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-class Test::Unit::TestCase
-end
+require 'wasko'
+include Wasko

data/test/test_applescript.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
-class TestWaskoApplescript < Test::Unit::TestCase
-  should "run an applescript and catch its return value" do
+describe Wasko::Applescript do
+  it "run an applescript and catch its return value" do
     value = Wasko::Applescript.run {"set ten_and_ten to 10 + 10"}
     assert_equal 20.to_s, value
   end

data/test/test_color.rb

@@ -1,32 +1,32 @@
 require 'helper'
 
-class TestWaskoColor < Test::Unit::TestCase
+describe Wasko::Color do
 
-  should "convert from applescript" do
+  it "convert from applescript" do
     assert_equal ::Color::RGB.from_html("#fff"), ::Color::RGB.from_applescript("{65535,65535,65535}")
   end
 
-  should "convert to applescript" do
+  it "convert to applescript" do
     assert_equal "{65535, 65535, 65535}", ::Color::RGB.from_html("#fff").to_applescript
   end
 
-  should "convert #fff to Color" do
+  it "convert #fff to Color" do
     assert_equal ::Color::RGB.from_html("#fff"), Wasko::Color.color_from_string("#fff")
   end
 
-  should "convert #cccccc to Color" do
+  it "convert #cccccc to Color" do
     assert_equal ::Color::RGB.from_html("#cccccc"), Wasko::Color.color_from_string("#cccccc")
   end
 
-  should "convert aliceblue to Color" do
+  it "convert aliceblue to Color" do
     assert_equal ::Color::RGB.from_html("#f0f8ff"), Wasko::Color.color_from_string("aliceblue")
   end
 
-  should "handle upcased css names to Color" do
+  it "handle upcased css names to Color" do
     assert_equal ::Color::RGB.from_html("#ff0000"), Wasko::Color.color_from_string("RED")
   end
 
-  should "gracefully handle bogus input names" do
+  it "gracefully handle bogus input names" do
     assert_nil Wasko::Color.color_from_string("poppycock")
   end
 end

data/test/test_palette.rb

@@ -1,36 +1,40 @@
 require 'helper'
 
-class TestWaskoPalette < Test::Unit::TestCase
+describe Wasko::Palette::Original do
+  it "is" do
+    assert true
+  end
+end
+describe Wasko::Palette do
 
   %w(white black blue green red 001e26 pink).each do |color_string|
-    context "creating a palette for #{color_string}" do
+    describe "creating a palette for #{color_string}" do
 
-      setup do
+      before do
         @base_color = Wasko::Color.color_from_string("white")
-        @palette = Wasko::Palette::TheOriginal.new("white")
+        @palette = Wasko::Palette::Original.new("white")
       end
 
-      should "have a foreground color with a high contrast" do
+      it "have a foreground color with a high contrast" do
         assert 0.5 < (@palette.colors[:foreground].brightness - @base_color.brightness).abs
       end
 
-      should "set its base color as the background color" do
+      it "set its base color as the background color" do
         assert_equal @base_color, @palette.colors[:base]
       end
     end
   end
 
-  should "generate all colors in its hash" do
-    palette = Wasko::Palette::TheOriginal.new("white")
+  it "generate all colors in its hash" do
+    palette = Wasko::Palette::Original.new("white")
     colors = %w(base foreground bold selection selected cursor red green yellow white black blue magenta cyan)
 
     assert_equal [],palette.colors.keys - colors.map(&:to_sym)
   end
 
-  should "generate a white colorscheme on faulty input" do
-    palette = Wasko::Palette::TheOriginal.new("fokdajong")
+  it "generate a white colorscheme on faulty input" do
+    palette = Wasko::Palette::Original.new("fokdajong")
     palette.colors[:base] = palette.white
   end
 
 end
-

data/test/test_terminal.rb

@@ -1,17 +1,17 @@
 require 'helper'
 
-class TestTerminal < Test::Unit::TestCase
-  context "defining dynamic methods" do
-    setup do
+describe Wasko::Terminal do
+  describe "defining dynamic methods" do
+    before do
       @terminal = Wasko::Terminal
     end
 
     %w(background_color normal_text_color font_size font_name cursor_color).each do |method|
-      should "support getter #{method}" do
+      it "support getter #{method}" do
         assert @terminal.respond_to? method.to_sym
       end
 
-      should "support setter set_#{method}" do
+      it "support setter set_#{method}" do
         assert @terminal.respond_to? "set_#{method}".to_sym
       end
     end

data/test/test_wasko.rb

@@ -1,25 +1,24 @@
 require 'helper'
 
-class TestWasko < Test::Unit::TestCase
+describe Wasko do
 
-  should "set background color to tint" do
+  it "set background color to tint" do
     ata = mock()
-    ata.expects(:startup_background_color).returns("{0,0,0}")
-    ata.expects(:set_background_color).with("{16962, 0, 0}").returns(nil)
+    ata.expects(:set_background_color).with("{65535, 0, 0}").returns(nil)
     Wasko.stubs(:advanced_typing_apparatus).returns(ata)
     Wasko.set_background_color("red")
   end
 
-  context "setting palette" do
-    setup do
+  describe "setting palette" do
+    before do
       @color = Wasko::Color.color_from_string("white")
       palette = mock()
       palette.expects(:colors).returns({:base => @color, :foreground => @color, :bold => @color, :cursor => @color, :selected => @color, :selection => @color}).at_least_once
-      Wasko::Palette::TheOriginal.expects(:new).with("white").returns(palette)
+      Wasko::Palette::Original.expects(:new).with("white").returns(palette)
 
     end
 
-    should "draw a palette" do
+    it "draw a palette" do
       Wasko.expects(:set_background_color).with(@color.html)
       Wasko.expects(:set_foreground_color).with(@color.html)
       Wasko.expects(:set_bold_color).with(@color.html)
@@ -29,39 +28,39 @@ class TestWasko < Test::Unit::TestCase
 
   end
 
-  should "set palette" do
+  it "set palette" do
 
   end
 
-  should "get font size" do
+  it "get font size" do
     ata = mock()
     ata.expects(:font_size).returns("14")
     Wasko.expects(:advanced_typing_apparatus).returns(ata)
     assert_equal Wasko.font_size, "14"
   end
 
-  should "set font size" do
+  it "set font size" do
     ata = mock()
     ata.expects(:set_font_size).with("14")
     Wasko.expects(:advanced_typing_apparatus).returns(ata)
     Wasko.set_font_size "14"
   end
 
-  should "get font name" do
+  it "get font name" do
     ata = mock()
     ata.expects(:font_name).returns("SomeFont")
     Wasko.expects(:advanced_typing_apparatus).returns(ata)
     assert_equal Wasko.font_name, "SomeFont"
   end
 
-  should "set font name" do
+  it "set font name" do
     ata = mock()
     ata.expects(:set_font_name).with("SomeFont")
     Wasko.expects(:advanced_typing_apparatus).returns(ata)
     Wasko.set_font_name("SomeFont")
   end
 
-  should "get font" do
+  it "get font" do
     ata = mock()
     ata.expects(:font_name).returns("SomeFont")
     ata.expects(:font_size).returns("14")
@@ -69,7 +68,7 @@ class TestWasko < Test::Unit::TestCase
     assert_equal Wasko.font, "SomeFont, 14"
   end
 
-  should "set font" do
+  it "set font" do
     ata = mock()
     ata.expects(:set_font_name).with("SomeFont")
     ata.expects(:set_font_size).with(14)
@@ -90,21 +89,21 @@ class TestWasko < Test::Unit::TestCase
   end
 
   # Test all getter/setter colors
-  context "getting/setting regular colors" do
+  describe "getting/setting regular colors" do
     %w(cursor_color foreground_color bold_color).each do |method|
 
-      setup do
+      before do
         @color = Wasko::Color.color_from_string("white")
       end
 
-      should "get the #{method} of the advanced typing apparatus" do
+      it "get the #{method} of the advanced typing apparatus" do
         ata = mock()
         ata.expects(method_to_expect(method).to_sym).returns(@color.to_applescript)
         Wasko.expects(:advanced_typing_apparatus).returns(ata)
         assert_equal @color.html, Wasko.send(method)
       end
 
-      should "set the #{method} of the advanced typing apparatus" do
+      it "set the #{method} of the advanced typing apparatus" do
 
         ata = mock()
         ata.expects("set_#{method_to_expect(method)}".to_sym).with(@color.to_applescript)

data/wasko.gemspec

@@ -15,10 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Wasko::VERSION
 
-  gem.add_runtime_dependency("thor", ["~> 0.15.4"])
   gem.add_runtime_dependency 'color'
   gem.add_runtime_dependency 'thor'
-
+  gem.add_runtime_dependency 'rake'
   gem.add_development_dependency 'shoulda'
   gem.add_development_dependency 'mocha'
 end

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: wasko
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - pjaspers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: color
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: color
+  name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Wasko colors your day/terminal
@@ -99,8 +88,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -121,6 +111,8 @@ files:
 - lib/wasko/configuration.rb
 - lib/wasko/iterm.rb
 - lib/wasko/palette.rb
+- lib/wasko/palettes/original.rb
+- lib/wasko/palettes/plain.rb
 - lib/wasko/terminal.rb
 - lib/wasko/version.rb
 - sample_generator.rb
@@ -133,33 +125,26 @@ files:
 - wasko.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2167249535749031942
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2167249535749031942
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wasko will allow you to quickly set a new background color for your terminal
 test_files:
 - test/helper.rb