tug 0.1.1 → 0.1.2

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
+env: CODECLIMATE_REPO_TOKEN=b8dd6ed54007032ccf75bfcc639e8f79c3ff3836307c0c910ea84e09506e8016
 cache:
   directories:
     - vendor/bundle
 rvm:
   - 2.0.0
 
-install: bundle install --without development --deployment
-script: rspec spec
+install: bundle install --deployment
+script: bundle exec rspec spec

data/Gemfile.lock

@@ -0,0 +1,75 @@
+PATH
+  remote: .
+  specs:
+    tug (0.1.2)
+      thor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    codeclimate-test-reporter (0.4.5)
+      simplecov (>= 0.7.1, < 1.0.0)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    ffi (1.9.3)
+    formatador (0.2.5)
+    guard (2.6.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.3.1)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    hitimes (1.2.2)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    method_source (0.8.2)
+    multi_json (1.10.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
+    thor (0.19.1)
+    timers (4.0.0)
+      hitimes
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  codeclimate-test-reporter
+  guard-rspec
+  rake
+  rspec
+  tug!

data/README.md

@@ -5,7 +5,8 @@
 Build and deploy iOS applications
 
 [![Build Status](https://travis-ci.org/alexfish/tug.svg?branch=feature%2Fbuild)](https://travis-ci.org/alexfish/tug)
-[![Code Climate](https://codeclimate.com/github/alexfish/tug.png)](https://codeclimate.com/github/alexfish/tug)
+[![Code Climate](https://codeclimate.com/github/alexfish/tug/badges/gpa.svg)](https://codeclimate.com/github/alexfish/tug)
+[![Test Coverage](https://codeclimate.com/github/alexfish/tug/badges/coverage.svg)](https://codeclimate.com/github/alexfish/tug)
 
 ## Installation
 

data/lib/tug.rb

@@ -13,6 +13,8 @@ require "tug/command/provision_command"
 require "tug/interface/interface"
 
 require "tug/config/config_file"
+require "tug/config/ipa_config_file"
+require "tug/config/keychain_config_file"
 require "tug/config/missing_config_file"
 
 require "tug/project/project"

data/lib/tug/config/config_file.rb

@@ -5,7 +5,22 @@ module Tug
     attr_reader :keychain
 
     class << self
-      def config_file(path=default_path)
+
+      def config_file(options)
+        if options.has_key?(:export)
+          Tug::IpaConfigFile.config_file(options)
+        elsif options.has_key?(:keychain)
+          Tug::KeychainConfigFile.config_file(options)
+        elsif options.has_key?(:config)
+          Tug::ConfigFile.config_file_from_path(options[:config])
+        else
+          Tug::MissingConfigFile.new
+        end
+      end
+
+      protected
+
+      def config_file_from_path(path=default_path)
         if path and File.file?(path)
           Tug::ConfigFile.new(path)
         else

data/lib/tug/config/ipa_config_file.rb

@@ -0,0 +1,14 @@
+module Tug
+  class IpaConfigFile < ConfigFile
+
+    class << self
+
+      def config_file(options)
+        config_file = config_file_from_path(options[:config])
+        config_file.project.configure(options)
+
+        return config_file
+      end
+    end
+  end
+end

data/lib/tug/config/keychain_config_file.rb

@@ -0,0 +1,14 @@
+module Tug
+  class KeychainConfigFile < ConfigFile
+
+    class << self
+
+      def config_file(options)
+        config_file = config_file_from_path(options[:config])
+        config_file.keychain.configure(options)
+
+        return config_file
+      end
+    end
+  end
+end

data/lib/tug/deployment/notes_parser.rb

@@ -14,7 +14,7 @@ module Tug
     end
 
     def initialize(notes)
-      @notes = notes
+      @notes = %Q|#{notes}|
     end
   end
 end

data/lib/tug/interface/interface.rb

@@ -3,25 +3,25 @@ module Tug
   class Deploy < Thor
 
     desc "testflight", "deploy an ipa to testflight"
-    option :file, 
-           :aliases => "-f", 
+    option :file,
+           :aliases => "-f",
            :default => Dir.glob("*.ipa").first
-    option :dsym, 
-           :aliases => "-d", 
+    option :dsym,
+           :aliases => "-d",
            :default => Dir.glob("*.dSYM.zip").first
-    option :api_token, 
-           :aliases => "-a", 
+    option :api_token,
+           :aliases => "-a",
            :default => ENV['TUG_TESTFLIGHT_API_TOKEN']
-    option :team_token, 
-           :aliases => "-t", 
+    option :team_token,
+           :aliases => "-t",
            :default => ENV['TUG_TESTFLIGHT_TEAM_TOKEN']
-    option :lists, 
+    option :lists,
            :aliases => "-l"
-    option :notify, 
-           :aliases => "-n", 
+    option :notify,
+           :aliases => "-n",
            :default => false
-    option :release_notes, 
-           :aliases => "-r", 
+    option :release_notes,
+           :aliases => "-r",
            :default => "This build was uploaded via Tug"
     def testflight
       deployer = Tug::Testflight.new(options)
@@ -29,31 +29,31 @@ module Tug
     end
 
     desc "hockeyapp", "deploy an ipa to hockeyapp"
-    option :file, 
-           :aliases => "-f", 
+    option :file,
+           :aliases => "-f",
            :default => Dir.glob("*.ipa").first
-    option :dsym, 
-           :aliases => "-d", 
+    option :dsym,
+           :aliases => "-d",
            :default => Dir.glob("*.dSYM.zip").first
-    option :api_token, 
-           :aliases => "-a", 
+    option :api_token,
+           :aliases => "-a",
            :default => ENV['TUG_HOCKEYAPP_API_TOKEN']
-    option :notify, 
-           :aliases => "-n", 
+    option :notify,
+           :aliases => "-n",
            :default => 0
-    option :release_notes, 
-           :aliases => "-r", 
+    option :release_notes,
+           :aliases => "-r",
            :default => "This build was uploaded via Tug"
-    option :notes_type, 
-           :aliases => "-y", 
+    option :notes_type,
+           :aliases => "-y",
            :default => 1
-    option :status, 
+    option :status,
            :aliases => "-s"
-    option :tags, 
+    option :tags,
            :aliases => "-t"
-    option :teams, 
+    option :teams,
            :aliases => "-e"
-    option :users, 
+    option :users,
            :aliases => "-u"
     option :mandatory,
            :aliases => "-m"
@@ -85,45 +85,41 @@ module Tug
   class Interface < Thor
 
     desc "build", "build a project"
-    option :config, 
-           :default => "#{Dir.pwd}/.tug.yml", 
+    option :config,
+           :default => "#{Dir.pwd}/.tug.yml",
            :aliases => "-c"
     def build
-      config_file = Tug::ConfigFile.config_file(options[:config])
+      config_file = Tug::ConfigFile.config_file(options)
       execute(__method__.to_s, config_file)
     end
 
     desc "ipa", "generate an ipa"
-    option :config, 
-           :default => "#{Dir.pwd}/.tug.yml", 
+    option :config,
+           :default => "#{Dir.pwd}/.tug.yml",
            :aliases => "-c"
-    option :export, 
-           :default => "#{Dir.pwd}", 
+    option :export,
+           :default => "#{Dir.pwd}",
            :aliases => "-e"
-    option :build_config, 
-           :default => "Release", 
+    option :build_config,
+           :default => "Release",
            :aliases => "-b"
     def ipa
-      config_file = Tug::ConfigFile.config_file(options[:config])
-      config_file.project.ipa_export_path = options[:export]
-      config_file.project.ipa_config = options[:build_config]
+      config_file = Tug::ConfigFile.config_file(options)
       execute(__method__.to_s, config_file)
     end
 
     desc "provision", "provision system distrubution certificates and provisioning profile"
-    option :config, 
-           :default => "#{Dir.pwd}/.tug.yml", 
+    option :config,
+           :default => "#{Dir.pwd}/.tug.yml",
            :aliases => "-c"
-    option :keychain, 
-           :default => "tug", 
+    option :keychain,
+           :default => "tug",
            :aliases => "-k"
-    option :password, 
-           :aliases => "-p", 
+    option :password,
+           :aliases => "-p",
            :default => ENV['TUG_P12_PASSWORD']
     def provision
-      config_file = Tug::ConfigFile.config_file(options[:config])
-      config_file.keychain.name = options[:keychain]
-      config_file.keychain.private_key_password = options[:password]
+      config_file = Tug::ConfigFile.config_file(options)
       execute(__method__.to_s, config_file)
     end
 

data/lib/tug/keychain/keychain.rb

@@ -27,6 +27,11 @@ module Tug
       @name                       = "tug"
     end
 
+    def configure(options)
+      @name = options[:keychain]
+      @private_key_password = options[:password]
+    end
+
     def create_keychain
       system("security create-keychain -p tug #{name}.keychain")
     end

data/lib/tug/project/project.rb

@@ -12,5 +12,10 @@ module Tug
       @workspace        = project_yaml['workspace']
       @ipa_export_path  = Dir.pwd
     end
+
+    def configure(options)
+      @ipa_export_path = options[:export]
+      @ipa_config = options[:build_config]
+    end
   end
 end

data/lib/tug/version.rb

@@ -1,3 +1,3 @@
 module Tug
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/config_file_spec.rb

@@ -2,24 +2,25 @@ require "spec_helper"
 
 describe Tug::ConfigFile do
 
-  before(:each) do  
+  before(:each) do
     file = File.expand_path(File.join(File.dirname(__FILE__), "../lib/tug/config/.tug.yml"))
     config = YAML.load_file(file)
     allow(YAML).to receive(:load_file).and_return(config)
     @config_file = Tug::ConfigFile.new("path")
+    @options = {:config => "path"}
   end
 
   describe "when returning a config file" do
     it "should return a config file for a path" do
       expect(File).to receive(:file?).and_return(true)
-      config_file = Tug::ConfigFile.config_file("path")
+      config_file = Tug::ConfigFile.config_file(@options)
       expect(config_file).to be_kind_of(Tug::ConfigFile)
     end
 
     it "should return a missing config file for no file found" do
       allow_any_instance_of(Tug::MissingConfigFile).to receive(:abort)
       expect(File).to receive(:file?).and_return(false)
-      config_file = Tug::ConfigFile.config_file("path")
+      config_file = Tug::ConfigFile.config_file(@options)
       expect(config_file).to be_kind_of(Tug::MissingConfigFile)
     end
   end

data/spec/ipa_config_file_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe Tug::IpaConfigFile do
+
+  before(:each) do
+    file = File.expand_path(File.join(File.dirname(__FILE__), "../lib/tug/config/.tug.yml"))
+    config = YAML.load_file(file)
+    allow(YAML).to receive(:load_file).and_return(config)
+    @config_file = Tug::ConfigFile.new("path")
+    @options = {:config => "path", :export => "export", :build_config => "config"}
+  end
+
+  describe "when returning a config file" do
+    it "should set the projects export" do
+      expect(File).to receive(:file?).and_return(true)
+      config_file = Tug::ConfigFile.config_file(@options)
+      expect(config_file.project.ipa_export_path).to match("export")
+    end
+
+    it "should set the projects build config" do
+      expect(File).to receive(:file?).and_return(true)
+      config_file = Tug::ConfigFile.config_file(@options)
+
+      expect(config_file.project.ipa_config).to match("config")
+    end
+  end
+end

data/spec/keychain_config_file_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe Tug::KeychainConfigFile do
+
+  before(:each) do
+    file = File.expand_path(File.join(File.dirname(__FILE__), "../lib/tug/config/.tug.yml"))
+    config = YAML.load_file(file)
+    allow(YAML).to receive(:load_file).and_return(config)
+    @config_file = Tug::ConfigFile.new("path")
+    @options = {:config => "path", :keychain => "keychain", :password => "password"}
+  end
+
+  describe "when returning a config file" do
+    it "should set the keychain name" do
+      expect(File).to receive(:file?).and_return(true)
+      config_file = Tug::ConfigFile.config_file(@options)
+      expect(config_file.keychain.name).to match("keychain")
+    end
+
+    it "should set the keychain password" do
+      expect(File).to receive(:file?).and_return(true)
+      config_file = Tug::ConfigFile.config_file(@options)
+
+      expect(config_file.keychain.private_key_password).to match("password")
+    end
+  end
+end

data/spec/notes_file_parser_spec.rb

@@ -1,12 +1,17 @@
 require 'spec_helper'
 
 describe Tug::NotesFileParser do
-  
+
   describe "When parsing notes" do
 
     it "should parse notes from a file" do
       parser = Tug::NotesFileParser.new(release_notes_path)
       expect(parser.notes).to match("Hello World")
     end
+
+    it "should parse notes with sepcial characters" do
+      parser = Tug::NotesFileParser.new(special_release_notes_path)
+      expect(parser.notes).to match("#Hello World's")
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
 require "tug"
+require "codeclimate-test-reporter"
+
+CodeClimate::TestReporter.start
 
 module Helpers
   def project_yaml
@@ -9,15 +12,19 @@ module Helpers
   end
 
   def keychain_yaml
-    {"keychain" => {"apple_certificate" => "apple", 
-            "distribution_certificate" => "dist", 
-            "distribution_profile" => "path/to/profile", 
+    {"keychain" => {"apple_certificate" => "apple",
+            "distribution_certificate" => "dist",
+            "distribution_profile" => "path/to/profile",
             "private_key" => "private"}}
   end
 
   def release_notes_path
     File.join(File.dirname(__FILE__), 'test_notes.txt')
   end
+
+  def special_release_notes_path
+    File.join(File.dirname(__FILE__), 'test_special_notes.txt')
+  end
 end
 
 RSpec.configure do |config|

data/spec/test_special_notes.txt

@@ -0,0 +1 @@
+#Hello World's

data/tug.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: tug
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
+  prerelease: 
 platform: ruby
 authors:
 - Alex Fish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,43 +46,65 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Build and deploy iOS project
@@ -91,6 +118,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - LICENSE.txt
@@ -105,6 +133,8 @@ files:
 - lib/tug/command/provision_command.rb
 - lib/tug/config/.tug.yml
 - lib/tug/config/config_file.rb
+- lib/tug/config/ipa_config_file.rb
+- lib/tug/config/keychain_config_file.rb
 - lib/tug/config/missing_config_file.rb
 - lib/tug/deployment/deployer.rb
 - lib/tug/deployment/hockeyapp.rb
@@ -125,6 +155,8 @@ files:
 - spec/deployer_spec.rb
 - spec/hockapp_spec.rb
 - spec/ipa_command_spec.rb
+- spec/ipa_config_file_spec.rb
+- spec/keychain_config_file_spec.rb
 - spec/keychain_spec.rb
 - spec/notes_file_parser_spec.rb
 - spec/output.txt
@@ -132,32 +164,34 @@ files:
 - spec/release_notes_spec.rb
 - spec/spec_helper.rb
 - spec/test_notes.txt
+- spec/test_special_notes.txt
 - spec/testflight_spec.rb
 - spec/xctool_spec.rb
 - tug.gemspec
 homepage: https://github.com/alexfish/tug
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: iOS project builder and depoloyer
 test_files:
 - spec/build_command_spec.rb
@@ -166,6 +200,8 @@ test_files:
 - spec/deployer_spec.rb
 - spec/hockapp_spec.rb
 - spec/ipa_command_spec.rb
+- spec/ipa_config_file_spec.rb
+- spec/keychain_config_file_spec.rb
 - spec/keychain_spec.rb
 - spec/notes_file_parser_spec.rb
 - spec/output.txt
@@ -173,5 +209,6 @@ test_files:
 - spec/release_notes_spec.rb
 - spec/spec_helper.rb
 - spec/test_notes.txt
+- spec/test_special_notes.txt
 - spec/testflight_spec.rb
 - spec/xctool_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a57b7de660e3ca5c1215173e39f045e292e42d7f
-  data.tar.gz: aab71d8938f647d4d6df7eb181c8a0109af56de1
-SHA512:
-  metadata.gz: d1c78cd1dadd20fb88b30218289558d46c5609145a37237a24ee812c5d9fc68306b3accc68dfff479f60fc2355be34ecd93daa80a45de815bb39d05e973a00f0
-  data.tar.gz: f32b83b3082a96e7e97727e1f45ea960ec51a0406d274d9edba8b496c1e53d8d3cd7c45da4b2ab83ee13f2d489f14f424555c39178430663fc4514e5e874fb2e