From 43baf34aae9ee4f129e52337847deee9a1d9d160 Mon Sep 17 00:00:00 2001
From: Matt Wynne <matt@mattwynne.net>
Date: Mon, 5 Sep 2011 22:19:20 +0100
Subject: [PATCH] Add an env variable for setting SSL on / off

---
 lib/relish.rb                    |   1 +
 lib/relish/commands/.base.rb.swp | Bin 12288 -> 0 bytes
 lib/relish/commands/.dsl.rb.swp  | Bin 12288 -> 0 bytes
 lib/relish/commands/base.rb      |   2 +-
 4 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 lib/relish/commands/.base.rb.swp
 delete mode 100644 lib/relish/commands/.dsl.rb.swp

diff --git a/lib/relish.rb b/lib/relish.rb
index f479ca0..f86a529 100644
--- a/lib/relish.rb
+++ b/lib/relish.rb
@@ -17,5 +17,6 @@ def #{name}                              # def global_options_file
     setting :global_options_file, File.join(File.expand_path('~'), '.relish')
     setting :local_options_file,  '.relish'
     setting :default_host,        'api.relishapp.com'
+    setting :default_ssl,         'on'
   end
 end
diff --git a/lib/relish/commands/.base.rb.swp b/lib/relish/commands/.base.rb.swp
deleted file mode 100644
index a6d98b084705540179705c7e9b04452e13206bcf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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
Vg<vg?eb|jt{sLAio?;!u`4`hjwNd~8

diff --git a/lib/relish/commands/.dsl.rb.swp b/lib/relish/commands/.dsl.rb.swp
deleted file mode 100644
index 6d8024367a08597e8b04c182cade7ab836ba252f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2zi-qq6vtgwT3W#X1A{rFUJlV*TLvUlhVny{p#l}?RO#>~?p<0Z4slK`DutPi
znVk&@nAu=pLSmq7NJtF)3ygf7_(B9N?OO3Hea`2XXZ!h+TdKM{y?k?#U-U09v<b$Z
zz04LrO{VPoqY)O1Jh$Qf+9L9<XuUplJJVCMzS4nEyUlrQ7i_1QUXwv?+L=_5>AOy(
zX}c%mwu-vL2Z4@bk%Xol8s%r*-BzR+86X1(H!#L7%+5^P{IiWS{KWBl2cJrrWPl8i
z0Wv@a$N(8217v^<9C`zJI>Mgd6i3`inyw%Dqjy8<$N(8217v^<kO4A42FL&zAOmE8
z43L3CXh4LF9UW!tJ+S}(AO8LSd7QCV;3*K`K3D?tU>3}PQSkK`V{gG5@ESY^8z2S>
zEQ1C(1x|vWV~qU(JKzOK!3wwmE`ifv0*r%isObyX0UyB!VC#GbsF49OKnBPF86X2>
zfDDiUGVos-kV(imFF(s3L)(TS`~7Npnb=R{hG(Q&ZTX>GjS}f4B9`a*WEZ!V*ISI)
zT-)k%InP97B%jZEgIFf{^(@mFE7EMHGO`+QZr9_NxyX7|aHB61e&=D_)vAhdUhIfW
zCE{)<_!hTi`34(%LPf%Ka;zcq7T>N-DyywOFZc3u-4Xt(!Ub!YRQbim3&QlPNFZ>I
z-?hO3ch{^vME~+ox3C~pdRK1dP`H_QLTQ35O7lo3s35oTH60~hV<l;{+;(<#o9CUg
z&nvlmFFG)yXXV-S+8RaJ+jEUuMHRkPWBA-$@dm69Q=NL4vHQE%#e7q*x(vDBhI@{>
zwzl0NVjT{Y<kyUSp>E)QVayGeirejsW%9uw$|P^P>+bbi?d?9CcI?5L|ITxh_Q@&>
R-6tu~iQTXhC}B*K{Q{dQJ1PJG

diff --git a/lib/relish/commands/base.rb b/lib/relish/commands/base.rb
index a9bda89..af2400e 100644
--- a/lib/relish/commands/base.rb
+++ b/lib/relish/commands/base.rb
@@ -15,7 +15,7 @@ class Base
 
       option :api_token, :default => lambda { get_and_store_api_token }
       option :host,      :default => lambda { Relish.default_host }
-      option :ssl,       :default => lambda { 'on' }
+      option :ssl,       :default => lambda { Relish.default_ssl }
 
       attr_writer :args
       attr_reader :cli_options