palette 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -10,6 +10,8 @@ GEM
       background_process
       cucumber (~> 0.9.3)
     background_process (1.2)
+    bourne (1.0)
+      mocha (= 0.9.8)
     builder (2.1.2)
     cucumber (0.9.3)
       builder (~> 2.1.2)
@@ -22,7 +24,7 @@ GEM
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     json (1.4.6)
-    mocha (0.9.9)
+    mocha (0.9.8)
       rake
     rake (0.8.7)
     rspec (1.3.0)
@@ -33,7 +35,8 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (= 0.2.4)
+  bourne (= 1.0)
   cucumber (= 0.9.3)
-  mocha (= 0.9.9)
+  mocha (= 0.9.8)
   palette!
   rspec (= 1.3.0)

data/README.markdown

@@ -10,11 +10,9 @@ Install with Rubygems:
 
 ## Usage
 
-    puts Palette::Dsl.run lambda {
-      vim_colors "great" do
-        # rules etc go here
-      end
-    }
+From your terminal:
+
+    palette path/to/color_scheme
 
 ## Syntax
 

data/Rakefile

@@ -1,2 +1,17 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+Bundler.require
+
+require "spec/rake/spectask"
+require "cucumber/rake/task"
+
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_files = FileList['spec/**/*.rb']
+end
+
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "features --format pretty"
+end
+
+task :default => [:spec, :features]

data/features/cli.feature

@@ -11,3 +11,14 @@ Feature: Run palette from the command line
     When I run "palette features/fixtures/schemes/missing_scheme"
     Then the output should not contain "colors_name"
     And the exit status should be 0
+
+  Scenario: Process a file with invalid palette syntax
+    Given a file named "features/fixtures/schemes/invalid_scheme" with:
+      """
+      vim_colors "bad syntax" do
+        totally made up junk
+      end
+      """
+    When I run "palette features/fixtures/schemes/invalid_scheme"
+    Then the exit status should be 1
+    And the output should contain "Please check the syntax of your palette file"

data/features/fixtures/schemes/valid_scheme

@@ -1,4 +1,12 @@
-vim_colors "awesomeness" do
+vim_colors "sweet" do
   author "Josh Clayton"
-  Normal "333", "FFF"
+  notes  "My really sweet theme"
+
+  reset      true
+  background :light
+
+  Normal "222", "f8f8ff"
+
+  Folded "808080", "ECECEC", :gui => "bold"
+  link :vimFold, :FoldColumn, :to => :Folded
 end

data/features/support/env.rb

@@ -4,7 +4,8 @@ require "aruba"
 
 Before do
   schemes_origin_dir = File.join(%w(features fixtures schemes))
-  schemes_dir = File.join(dirs.first, schemes_origin_dir)
+  schemes_dir        = File.join(dirs.first, schemes_origin_dir)
+
   FileUtils.mkdir_p(schemes_dir)
   FileUtils.cp(Dir.glob(File.join(schemes_origin_dir, "*")), schemes_dir)
 end

data/lib/palette/cli.rb

@@ -3,9 +3,14 @@ module Palette
   class Cli
     def initialize(*args)
       if File.exist?(path = File.expand_path(args.first))
-        puts Palette::Dsl.run lambda {
-          eval(IO.read(path), binding, path)
-        }
+        begin
+          puts Palette::Dsl.run lambda {
+            eval(IO.read(path), binding, path)
+          }
+        rescue
+          p "Please check the syntax of your palette file"
+          exit 1
+        end
       end
     end
   end

data/lib/palette/version.rb

@@ -1,3 +1,3 @@
 module Palette
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require "spec"
 require "mocha"
 require "palette"
+require "bourne"
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: palette
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Josh Clayton
@@ -42,18 +42,33 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 43
         segments: 
         - 0
         - 9
-        - 9
-        version: 0.9.9
+        - 8
+        version: 0.9.8
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: bourne
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -65,11 +80,11 @@ dependencies:
         - 3
         version: 0.9.3
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -81,7 +96,7 @@ dependencies:
         - 4
         version: 0.2.4
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: Palette provides an easy way to build Vim color schemes
 email: 
 - joshua.clayton@gmail.com