pulsar 0.2.1 → 0.2.2

data/lib/pulsar/helpers/clamp.rb

@@ -59,10 +59,14 @@ module Pulsar
         end
 
         def fetch_repo
-          if conf_repo =~ /\A[a-zA-Z-]+\/[a-zA-Z-]+\Z/
-            fetch_git_repo("git@github.com:#{conf_repo}.git")
-          else
+          if File.directory?(conf_repo)
             fetch_directory_repo(conf_repo)
+          else
+            if conf_repo =~ /\A[a-zA-Z-]+\/[a-zA-Z-]+\Z/
+              fetch_git_repo("git@github.com:#{conf_repo}.git")
+            else
+              fetch_git_repo(conf_repo)
+            end
           end
         end
 
@@ -138,7 +142,7 @@ module Pulsar
             File.readlines(conf_file).each do |line|
               conf, value = line.split("=")
 
-              ENV[conf] = value.chomp.gsub('"', '')
+              ENV[conf] = value.chomp.gsub('"', '') if !conf.nil? && !value.nil?
             end
           end
         end

data/lib/pulsar/version.rb

@@ -1,3 +1,3 @@
 module Pulsar
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/pulsar/commands/main_spec.rb

@@ -73,6 +73,19 @@ describe Pulsar::MainCommand do
     ENV['PULSAR_CONF_REPO'].should == dummy_conf_path
   end
 
+  it "skips lines which cannot parse when reading .pulsar file" do
+    env_vars = [ "wrong_line", "# comment"] 
+
+    File.stub(:file?).and_return(true)
+    File.stub(:readlines).with("#{File.expand_path(dummy_rack_app_path)}/.pulsar").and_return(env_vars)
+
+    FileUtils.cd(dummy_rack_app_path) do
+      reload_main_command
+
+      expect { pulsar.run(full_cap_args + %w(production)) }.not_to raise_error
+    end
+  end
+
   context "Capfile" do
     it "uses base.rb in staging stage" do
       pulsar.run(full_cap_args + dummy_app(:staging))

data/spec/pulsar/helpers/clamp_spec.rb

@@ -3,6 +3,53 @@ require 'spec_helper'
 describe Pulsar::Helpers::Clamp do
   include Pulsar::Helpers::Clamp
 
+  context "fetch_repo" do
+    it "supports directories" do
+      File.stub(:directory?).and_return(true)
+      self.stub!(:conf_repo).and_return("conf-repo/path")
+
+      self.should_receive(:fetch_directory_repo).with("conf-repo/path")
+
+      fetch_repo
+    end
+
+    it "supports full git path" do
+      File.stub(:directory?).and_return(false)
+      self.stub!(:conf_repo).and_return("git://github.com/gh_user/pulsar-conf.git")
+
+      self.should_receive(:fetch_git_repo).with("git://github.com/gh_user/pulsar-conf.git")
+
+      fetch_repo
+    end
+
+    it "supports full git path on ssh" do
+      File.stub(:directory?).and_return(false)
+      self.stub!(:conf_repo).and_return("git@github.com:gh_user/pulsar-conf.git")
+
+      self.should_receive(:fetch_git_repo).with("git@github.com:gh_user/pulsar-conf.git")
+
+      fetch_repo
+    end
+
+    it "supports full git path on http" do
+      File.stub(:directory?).and_return(false)
+      self.stub!(:conf_repo).and_return("https://github.com/gh_user/pulsar.git")
+
+      self.should_receive(:fetch_git_repo).with("https://github.com/gh_user/pulsar.git")
+
+      fetch_repo
+    end
+
+    it "supports github path" do
+      File.stub(:directory?).and_return(false)
+      self.stub!(:conf_repo).and_return("gh-user/pulsar-conf")
+
+      self.should_receive(:fetch_git_repo).with("git@github.com:gh-user/pulsar-conf.git")
+
+      fetch_repo
+    end
+  end
+
   context "run_cmd" do
     it "raises exception if command fails" do
       expect { run_cmd("return 1", {}) }.to raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulsar
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -207,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3984210847033378196
+      hash: 2516214880330231667
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3984210847033378196
+      hash: 2516214880330231667
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25