speckle 0.1.22 → 0.1.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGRkMGEyYjY5NTVmOWM5Njc0MGU4ZDNlOWI2MGQzMjE5MWUzNjAwMw==
+    YTI5ZjViNTdhYTBmZmZmZjYyMzI5YzA1ODExYzAzNzU0Y2MwYjgzYw==
   data.tar.gz: !binary |-
-    MmIxYzFjZTFiZWFiYjgyOWNlN2VkZWVmMTVmODE2OWJhN2U1NjgxOQ==
+    MmMzMjJkOTliY2VlMmU0YzdkOWUwNDIxZThhNzE5ZmZkNTg2ZDNmOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWUzZWVkZDI5NTNmZDc0YmM5MDRjMjA0MDc3MWE0YTAzZDRmNDg2NDNlY2M2
-    ZTRkNmJiZTZjY2QzYzA4ZWU2ZTc3MzY0OTI4MjFkZjc1N2MzYTU0MmU4MWU4
-    ZmYzNDZlNGJkOTI0MzVhNjgwMjlmMGU2MmI5MWQ1ZDViZGY1YWM=
+    NWQzZDY1YzAzODY1M2JmNGUzZDZiYjVkMjMwZGViMWJhMTg3OGY2MTUxNjg2
+    NzQxOTFmZTY2MGUzYTc0YzBiMjQ5Y2ZmYmY0NTZiNTk3ZjUzMTg4NzgwZTI2
+    MjA3ZDQ0YjFjNjkzYWYzZDUxNmM1YTEzZTNjZjcyODA4NmRlNzU=
   data.tar.gz: !binary |-
-    MTljZDE2Yzk3MTkxZGM2YTQ5YTdiZGZlNGQxOTVkZTJkOGUwMTc0ZDhkZDVm
-    YWUzZmNjZmYyNzQzNmUyYTFiZmUxYjZiN2ZjODE4ZGQ1YzAwZGQ2ZTVkMmRj
-    YjdkZmM4YzQyZWM0NmU3YTRkMmI1YTBlZjJlNjFhY2Q4MThiZDA=
+    MTMwOGI3MTYyZGI1OTk0Y2ViOWRmNTFkNWVhMzEwNTlmM2NkNzFkMGI2NjE3
+    MzdlODM3NWVhNzZmYWZlYmVkNGJmMzNiODM1Yzk5ZjM1NzY4N2IxOWViNzlj
+    M2U5NWI0NGZiZjZlMGZjMzU3NjBkMWMwZDNjN2EyYWMzMDI0YWM=

data/Rakefile

@@ -77,6 +77,7 @@ namespace :speckle do
   TEST_VIM = ENV['TEST_VIM'] || 'vim'
   TEST_REPORTER = ENV['TEST_REPORTER'] || 'spec'
   TEST_LOG = "#{BUILD_DIR}/speckle.log"
+  TEST_EXIT_FILE = "#{TEST_LOG}.exit"
   DEBUG_LOG = "#{BUILD_DIR}/debug.log"
   TEST_SOURCES  = FileList.new do |fl|
     sources = ENV['TEST_SOURCES']
@@ -217,9 +218,18 @@ namespace :speckle do
     begin
       verbose DEBUG do
         launch_file = get_launch_cmd_file()
+        File.delete(TEST_LOG) if File.exist?(TEST_LOG)
+        File.delete(TEST_EXIT_FILE) if File.exist?(TEST_EXIT_FILE)
+
         sh "#{TEST_VIM} #{get_vim_options()} -S #{launch_file.path}"
-        sh "cat #{TEST_LOG}"
         launch_file.unlink
+        if File.exist?(TEST_EXIT_FILE)
+          sh "cat #{TEST_LOG}"
+          exit_code = File.read(TEST_EXIT_FILE)[0].to_i
+          exit!(exit_code)
+        else
+          fail "Fatal error: #{TEST_LOG} not found."
+        end
       end
     rescue RuntimeError => error
       puts error

data/lib/speckle/cli/environment.rb

@@ -114,14 +114,18 @@ module Speckle
           parser.parse!(args)
 
           if options.action.nil?
-            spec_dir = "#{options.cwd}/spec"
-            if File.directory?(spec_dir)
-              args << 'spec'
-              options.action = :compile_and_test
+            if args_empty?(args)
+              spec_dir = "#{options.cwd}/spec"
+              if File.directory?(spec_dir)
+                args << 'spec'
+                options.action = :compile_and_test
+              else
+                options.action = :show_no_spec_dir
+              end
             else
-              options.action = :show_no_spec_dir
+              options.action = :compile_and_test
             end
-          elsif action_needs_args?(options.action) and args.empty?
+          elsif action_needs_args?(options.action) and args_empty?(args)
             spec_dir = "#{options.cwd}/spec"
             if File.directory?(spec_dir)
               args << 'spec'
@@ -164,6 +168,10 @@ module Speckle
 
         libs.uniq.join(':')
       end
+
+      def args_empty?(args)
+        args.empty? || (args.length == 1 && args[0] == '')
+      end
     end
 
   end

data/lib/speckle/version.rb

@@ -1,3 +1,3 @@
 module Speckle
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

data/lib/speckle.riml

@@ -105,6 +105,10 @@ class g:Speckle
     return g:speckle_output_file
   end
 
+  defm get_exit_code_file
+    return self.get_output_file() . '.exit'
+  end
+
   defm get_reporter_name
     return g:speckle_reporter_name
   end
@@ -149,6 +153,8 @@ class g:Speckle
     if self.is_file_mode()
       writer.flush()
     end
+
+    self.write_exit_code(stats.is_ok())
   end
 
   defm add_specs(runner, lines)
@@ -164,4 +170,15 @@ class g:Speckle
       end
     end
   end
+
+  defm get_exit_code(ok)
+    return ok == true ? '0' : '1'
+  end
+
+  defm write_exit_code(ok)
+    writer = new FileWriter()
+    writer.set_output_file(self.get_exit_code_file())
+    writer.write(self.get_exit_code(ok))
+    writer.flush()
+  end
 end

data/portkey.json

@@ -0,0 +1,33 @@
+{
+  "lib/matchers/*.riml": {
+    "type": "matcher",
+    "test": "spec/matchers/%s_spec.riml"
+  },
+  "lib/reporters/*.riml": {
+    "type": "reporter"
+  },
+  "lib/runners/*.riml": {
+    "type": "runner"
+  },
+  "lib/writers/*.riml": {
+    "type": "writer",
+    "mapping": "i"
+  },
+  "lib/utils/*.riml": {
+    "type": "utility"
+  },
+  "lib/speckle/cli/*.rb": {
+    "type": "cli"
+  },
+  "lib/speckle/list/*.rb": {
+    "type": "list"
+  },
+
+  "spec/matchers/*_spec.riml": {
+    "type": "spec",
+    "alternate": "lib/matchers/%s.riml"
+  },
+  "spec/*_spec.riml": {
+    "type": "spec"
+  }
+}

data/spec/speckle/cli/environment_spec.rb

@@ -103,7 +103,7 @@ end
 
 module Speckle
   module CLI
-    
+
     describe 'Main options basics' do
 
       it 'defaults to compile_and_test without args' do
@@ -129,7 +129,7 @@ module Speckle
 
     describe 'Source path defaults' do
 
-      it 'has uses spec directory if present' do
+      it 'uses spec directory without args', :dms => true do
         expect('').to include_path('spec')
       end
 
@@ -147,6 +147,17 @@ module Speckle
         expect('-t').to include_path('spec')
         expect('--test').to include_path('spec')
       end
+
+      it 'does not use spec directory when file is specified', :dms => true do
+        expect('a.riml').to include_path('a.riml')
+        expect('a.riml').to_not include_path('spec')
+      end
+
+      it 'does not use spec directory when multiple file is specified', :dms => true do
+        env = Environment.new
+        opts = env.load(['a.riml', 'b.riml'])
+        expect(opts.inputs).to eq(['a.riml', 'b.riml'])
+      end
     end
 
     describe 'Extra options and flags' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speckle
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Darshan Sawardekar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riml
@@ -159,6 +159,7 @@ files:
 - lib/writers/console_writer.riml
 - lib/writers/file_writer.riml
 - lib/writers/writer_factory.riml
+- portkey.json
 - spec/after_hooks_spec.riml
 - spec/before_hooks_spec.riml
 - spec/logger/logger_spec.riml