tug 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3a19cbd80c7658c71fc5354c84c7703b52b33d6
-  data.tar.gz: 5669abeb191d05076e9a98b6429f7f3462ce887a
+  metadata.gz: 4cbbce158fb85e6fdfd5bef8222318e185c1fd6a
+  data.tar.gz: a480e0d51a26bca15128b412e19d7884495f49b6
 SHA512:
-  metadata.gz: 49cc50b509c9a4c45de9c77eb501af64c889a026aae9c4ab292f0c1be18249885e82f9dc6f8e52d7ec41d7d656ad2430881dec0888f498daafd9623b058bec10
-  data.tar.gz: 102358c25830e6457f3bd5cd91492429da44bee78445690579173829ffe56cd3ee4173cdbe45dbe96fc601b70eea017d82e0ba6ce7a4fdaf608787c5a1f11fe1
+  metadata.gz: 40580a44ec5e85d50ceabb7881da0c1eb454bd61679f0432c290113ed5bb3944fca118573e0c8006ed424d78eebd88dc389f4e8b6f431e7396f0c5fc2e1b9406
+  data.tar.gz: 0c5dae991023d318c4562cd57eb52f4194736760b8945c556d8612b35bdb410f7f0d145eb1c928a89d1258ff09227714b6b0c8690fcdab8f32712448c9386ce1

data/lib/tug/config/config_file.rb

@@ -16,8 +16,8 @@ module Tug
 
     def initialize(path)
       config = YAML::load_file(path)
-      @project = Tug::Project.new(config['project'])
-      @keychain = Tug::Keychain.keychain(config['keychain'])
+      @project = Tug::Project.new(config)
+      @keychain = Tug::Keychain.keychain(config)
     end
 
     private

data/lib/tug/keychain/keychain.rb

@@ -9,8 +9,10 @@ module Tug
     attr_accessor :name
 
     class << self
-      def keychain(keychain_yaml)
-        Tug::Keychain.new(keychain_yaml)
+      def keychain(config)
+        if config.has_key?("keychain")
+          Tug::Keychain.new(config["keychain"])
+        end
       end
     end
 

data/lib/tug/project/project.rb

@@ -6,7 +6,8 @@ module Tug
     attr_reader   :ipa_config
     attr_accessor :ipa_export_path
 
-    def initialize(project_yaml)
+    def initialize(config)
+      project_yaml      = config['project']
       @schemes          = project_yaml['schemes']
       @workspace        = project_yaml['workspace']
       @ipa_config       = project_yaml['ipa_config']

data/lib/tug/version.rb

@@ -1,3 +1,3 @@
 module Tug
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/ipa_command_spec.rb

@@ -10,7 +10,7 @@ describe Tug::IpaCommand do
       allow(FileUtils).to receive(:mv)
 
       yaml = project_yaml
-      yaml["ipa_config"] = "InHouse"
+      yaml["project"]["ipa_config"] = "InHouse"
       @project = Tug::Project.new(yaml)
 
       @config = double(Tug::ConfigFile)

data/spec/keychain_spec.rb

@@ -3,20 +3,19 @@ require "spec_helper"
 describe Tug::Keychain do 
 
   before(:each) do
-    @yaml = {"apple_certificate" => "apple", 
-            "distribution_certificate" => "dist", 
-            "distribution_profile" => "path/to/profile", 
-            "private_key" => "private"}
+    @yaml = keychain_yaml
 
     @keychain = Tug::Keychain.keychain(@yaml)
     allow(@keychain).to receive(:system)
   end
 
   describe "when returning keychains" do
-    it "should return a keychian" do
+    it "should return a keychain" do
+      expect(@keychain).to be
     end
 
-    it "should return a protected keychain if password is missing" do
+    it "shouldn't return one for invalid config" do
+      expect(Tug::Keychain.keychain({})).to be_nil
     end
   end
 

data/spec/spec_helper.rb

@@ -2,10 +2,17 @@ require "tug"
 
 module Helpers
   def project_yaml
-    {"workspace" => "workspace",
+    {"project" => {"workspace" => "workspace",
       "schemes" => ["scheme"],
       "ipa_config" => "config",
-      "ipa_profile" => "profile"}
+      "ipa_profile" => "profile"}}
+  end
+
+  def keychain_yaml
+    {"keychain" => {"apple_certificate" => "apple", 
+            "distribution_certificate" => "dist", 
+            "distribution_profile" => "path/to/profile", 
+            "private_key" => "private"}}
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tug
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Alex Fish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor