tug 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0f04066550ec73a472a473a530e238eaa050fe1
-  data.tar.gz: e8a6e5cdd34db844080fc4094ef3754dc26038e5
+  metadata.gz: 7ef802a29eb4279c1e6e9d21812d43a2e83013f0
+  data.tar.gz: 0978140b84a203282b7349981233499d802c10ba
 SHA512:
-  metadata.gz: 4266e77f7d852065763213749cf9fdcfd87fe3103707eca527ff34db4e040a0008d16d1724a3fc192587abbe1276dd1ec93a550dfdaa38f3a5db97914cf2e9a1
-  data.tar.gz: 3e8287720422c09cfb00fad2491f64a4ac5c33996aba50e1b31767cf29136d1875ac8cb215bb381c479185d90e5168d5ba1024ac0e080bc2d724431f853c4112
+  metadata.gz: 146d9fd46884fbcefd7029950802c81b89a337389a2a45a72d1086d3240421980391e4042b4c7827ae55227604855504dc111a0a40b2b883ae0f92e4f3cf2b80
+  data.tar.gz: 773f873d8f169831cd61d7c791e3d44927c9ed2ae68bd6d7c90bb7b63277f13c424dc4636381253768f21f0a553cb32617c921f6474c07a234bb2459de731e0e

data/README.md

@@ -95,6 +95,37 @@ $ tug deploy testflight
 > * `TUG_TESTFLIGHT_API_KEY`
 > * `TUG_TESTFLIGHT_TEAM_KEY`
 
+#### Hockeyapp
+
+```
+$ tug ipa
+$ tug deploy hockeyapp
+```
+
+###### Options
+
+```
+-f, [--file]              # path to an ipa to deploy (optional, searches current directory by default)
+-a, [--api-token]         # hockeyapp api key (optional, environmental variable by default)
+-n, [--notify]            # notify users of the new build (optional, defaults to 0)
+-r, [--release-notes]     # release notes for the build, can be plain text or a path to a file (optional)
+-y, [--notes-type]        # the format of the notes (optional, defaults to 1 for markdown)
+-s, [--status]            # the hockeyapp download status (optional)
+-t, [--tags]              # restrict the download to a list of hockeyapp tags (optional)
+-e, [--teams]             # restirct the download to a list of hockeyapp teams (optional)
+-u, [--users]             # restirct the download to a list of hockeyapp user ids (optional)
+-m, [--mandatory]         # set as a mandatory build (optional)
+-l, [--release-type]      # set the type of the release (optiona, defaults to 0 for beta)
+-p, [--private]           # set if the build is private (optional, defaults to false)
+-h, [--commit-sha]        # set the sha associated with this build (optional)
+-u, [--build-server-url]  # set the URL of the build that generated the ipa (optional)
+-p, [--repository-url]    # set the URL of the repo associated with the project (optional)
+```
+
+> 
+> The following environment variable is used to set your hockeyapp API key
+> * `TUG_HOCKEYAPP_API_KEY`
+
 ### Provision
 
 Tug can provision a new machine ready for signing ipas by installing the certificates and provisioning profile required for generating a signed ipa of your application, this is very useful for CI environments like Travis. 

data/lib/tug/deployment/deployer.rb

@@ -1,26 +1,17 @@
 module Tug
   class Deployer
 
-    attr_reader :ipa
+    attr_reader :file
     attr_reader :api_token
-    attr_reader :team_token
-    attr_reader :lists
-    attr_reader :notify
     attr_reader :notes
-
-    class << self
-      def deployer(options)
-        Tug::Deployer.new(options)
-      end
-    end
+    attr_reader :notify
 
     def initialize(options)
-      @ipa        = options[:file]
-      @lists      = options[:lists]
-      @notify     = options[:notify]
+      @file       = options[:file]
       @api_token  = options[:api_token]
-      @team_token = options[:team_token]
-      self.notes  = options[:release_notes]
+      @notify     = options[:notify]
+
+      self.notes   = options[:release_notes]
     end
 
     def deploy
@@ -37,16 +28,12 @@ module Tug
     private
 
     def url
-      "http://testflightapp.com/api/builds.json"
+      ""
     end
 
     def params
-      params = "-F file=@#{ipa} "
-      params += "-F api_token='#{api_token}' "
-      params += "-F team_token='#{team_token}' "
-      params += "-F notes='#{notes}' "
-      params += "-F distribution_lists='#{lists}' "
-      params += "-F notify=#{notify}"
+      params = "-F notes='#{notes}' "
+      params += "-F notify=#{notify} "
     end
   end
 end

data/lib/tug/deployment/hockeyapp.rb

@@ -0,0 +1,55 @@
+module Tug
+  class Hockeyapp < Deployer
+
+    attr_reader :notes_type
+    attr_reader :status
+    attr_reader :tags
+    attr_reader :teams
+    attr_reader :users
+    attr_reader :mandatory
+    attr_reader :release_type
+    attr_reader :private
+    attr_reader :commit_sha
+    attr_reader :build_server_url
+    attr_reader :repository_url
+
+    def initialize(options)
+      super
+
+      @notes_type         = options[:notes_type]
+      @status             = options[:status]
+      @tags               = options[:tags]
+      @teams              = options[:teams]
+      @users              = options[:users]
+      @mandatory          = options[:mandatory]
+      @release_type       = options[:release_type]
+      @private            = options[:private]
+      @commit_sha         = options[:commit_sha]
+      @build_server_url   = options[:build_server_url]
+      @repository_url     = options[:repository_url]
+    end
+
+    private
+
+    def url
+      "https://rink.hockeyapp.net/api/2/apps/upload"
+    end
+
+    def params
+      params = super
+      params += "-F \"ipa=@#{file}\" "
+      params += "-F \"teams=#{teams}\" "
+      params += "-F \"users=#{users}\" "
+      params += "-F \"mandatory=#{mandatory}\" "
+      params += "-F \"release_type=#{release_type}\" "
+      params += "-F \"private=#{private}\" "
+      params += "-F \"commit_sha=#{commit_sha}\" "
+      params += "-F \"build_server_url=#{build_server_url}\" "
+      params += "-F \"repository_url=#{repository_url}\" "
+      params += "-F \"tags=#{tags}\" "
+      params += "-F \"status=#{status}\" "
+      params += "-F \"notes_type=#{notes_type}\" "
+      params += "-H \"X-HockeyAppToken: #{api_token}\" "
+    end
+  end
+end

data/lib/tug/deployment/testflight.rb

@@ -0,0 +1,28 @@
+module Tug
+  class Testflight < Deployer
+
+    attr_reader :team_token
+    attr_reader :lists
+
+    def initialize(options)
+      super
+
+      @lists      = options[:lists]
+      @team_token = options[:team_token]
+    end
+
+    private
+
+    def url
+      "http://testflightapp.com/api/builds.json"
+    end
+
+    def params
+      params = super
+      params += "-F file=@#{file} "
+      params += "-F api_token='#{api_token}' "
+      params += "-F team_token='#{team_token}' "
+      params += "-F distribution_lists='#{lists}' "
+    end
+  end
+end

data/lib/tug/interface/interface.rb

@@ -3,14 +3,68 @@ module Tug
   class Deploy < Thor
 
     desc "testflight", "deploy an ipa to testflight"
-    option :file, :aliases => "-f", :default => Dir.glob("*.ipa").first
-    option :api_token, :aliases => "-a", :default => ENV['TUG_TESTFLIGHT_API_TOKEN']
-    option :team_token, :aliases => "-t", :default => ENV['TUG_TESTFLIGHT_TEAM_TOKEN']
-    option :lists, :aliases => "-l"
-    option :notify, :aliases => "-n", :default => false
-    option :release_notes, :aliases => "-r", :default => "This build was uploaded via Tug"
+    option :file, 
+           :aliases => "-f", 
+           :default => Dir.glob("*.ipa").first
+    option :api_token, 
+           :aliases => "-a", 
+           :default => ENV['TUG_TESTFLIGHT_API_TOKEN']
+    option :team_token, 
+           :aliases => "-t", 
+           :default => ENV['TUG_TESTFLIGHT_TEAM_TOKEN']
+    option :lists, 
+           :aliases => "-l"
+    option :notify, 
+           :aliases => "-n", 
+           :default => false
+    option :release_notes, 
+           :aliases => "-r", 
+           :default => "This build was uploaded via Tug"
     def testflight
-      deployer = Tug::Deployer.deployer(options)
+      deployer = Tug::Testflight.new(options)
+      deployer.deploy
+    end
+
+    desc "hockeyapp", "deploy an ipa to hockeyapp"
+    option :file, 
+           :aliases => "-f", 
+           :default => Dir.glob("*.ipa").first
+    option :api_token, 
+           :aliases => "-a", 
+           :default => ENV['TUG_HOCKEYAPP_API_TOKEN']
+    option :notify, 
+           :aliases => "-n", 
+           :default => 0
+    option :release_notes, 
+           :aliases => "-r", 
+           :default => "This build was uploaded via Tug"
+    option :notes_type, 
+           :aliases => "-y", 
+           :default => 1
+    option :status, 
+           :aliases => "-s"
+    option :tags, 
+           :aliases => "-t"
+    option :teams, 
+           :aliases => "-e"
+    option :users, 
+           :aliases => "-u"
+    option :mandatory,
+           :aliases => "-m"
+    option :release_type,
+           :aliases => "-l",
+           :default => 0
+    option :private,
+           :aliases => "-p",
+           :default => false
+    option :commit_sha,
+           :aliases => "-h"
+    option :build_server_url,
+           :aliases => "-u"
+    option :repository_url,
+           :aliases => "-p"
+    def hockeyapp
+      deployer = Tug::Hockeyapp.new(options)
       deployer.deploy
     end
 
@@ -25,16 +79,24 @@ module Tug
   class Interface < Thor
 
     desc "build", "build a project"
-    option :config, :default => "#{Dir.pwd}/.tug.yml", :aliases => "-c"
+    option :config, 
+           :default => "#{Dir.pwd}/.tug.yml", 
+           :aliases => "-c"
     def build
       config_file = Tug::ConfigFile.config_file(options[:config])
       execute(__method__.to_s, config_file)
     end
 
     desc "ipa", "generate an ipa"
-    option :config, :default => "#{Dir.pwd}/.tug.yml", :aliases => "-c"
-    option :export, :default => "#{Dir.pwd}", :aliases => "-e"
-    option :build_config, :default => "Release", :aliases => "-b"
+    option :config, 
+           :default => "#{Dir.pwd}/.tug.yml", 
+           :aliases => "-c"
+    option :export, 
+           :default => "#{Dir.pwd}", 
+           :aliases => "-e"
+    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]
@@ -43,9 +105,15 @@ module Tug
     end
 
     desc "provision", "provision system distrubution certificates and provisioning profile"
-    option :config, :default => "#{Dir.pwd}/.tug.yml", :aliases => "-c"
-    option :keychain, :default => "tug", :aliases => "-k"
-    option :password, :aliases => "-p", :default => ENV['TUG_P12_PASSWORD']
+    option :config, 
+           :default => "#{Dir.pwd}/.tug.yml", 
+           :aliases => "-c"
+    option :keychain, 
+           :default => "tug", 
+           :aliases => "-k"
+    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]

data/lib/tug/version.rb

@@ -1,3 +1,3 @@
 module Tug
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/tug.rb

@@ -24,5 +24,7 @@ require "tug/tool/xctool_archive"
 require "tug/keychain/keychain"
 
 require "tug/deployment/deployer"
+require "tug/deployment/testflight"
+require "tug/deployment/hockeyapp"
 require "tug/deployment/notes_parser"
 require "tug/deployment/notes_file_parser"

data/spec/deployer_spec.rb

@@ -5,55 +5,23 @@ describe Tug::Deployer do
   before(:each) do
     @options = {
       :api_token => "api_token",
-      :team_token => "team_token",
       :file => "test.ipa",
-      :notify => true,
-      :release_notes => "Notes"
+      :release_notes => "Notes",
+      :notify => 1
     }
 
-    @deployer = Tug::Deployer.deployer(@options)
-  end
-
-  describe "when returning a deployer" do
-    it "should return a default deployer" do
-      expect(Tug::Deployer.deployer(@options)).to be_kind_of(Tug::Deployer)
-    end
+    @deployer = Tug::Deployer.new(@options)
   end
 
   describe "when deploying" do
 
-    it "should send to testflight by default" do
-      expect(IO).to receive(:popen).with(/http:\/\/testflightapp.com\/api\/builds.json/)
-      @deployer.deploy
-    end
-
-    it "should send the ipa as a param" do
-      expect(IO).to receive(:popen).with(/-F file=@test.ipa/)
-      @deployer.deploy
-    end
-
-    it "should send the team token as a param" do
-      expect(IO).to receive(:popen).with(/-F team_token='team_token'/)
-      @deployer.deploy
-    end
-
-    it "should send the api token as a param" do
-      expect(IO).to receive(:popen).with(/-F api_token='api_token'/)
-      @deployer.deploy
-    end
-
     it "should have some release notes" do
       expect(IO).to receive(:popen).with(/-F notes='Notes'/)
       @deployer.deploy
     end
 
-    it "should have lists" do
-      expect(IO).to receive(:popen).with(/-F distribution_lists=''/)
-      @deployer.deploy
-    end
-
     it "should notify" do
-      expect(IO).to receive(:popen).with(/-F notify=true/)
+      expect(IO).to receive(:popen).with(/-F notify=1/)
       @deployer.deploy
     end
   end

data/spec/hockapp_spec.rb

@@ -0,0 +1,104 @@
+require 'spec_helper'
+
+describe Tug::Hockeyapp do
+
+  before(:each) do
+    @options = {
+      :api_token => "api_token",
+      :file => "test.ipa",
+      :release_notes => "Notes",
+      :notify => 1,
+      :notes_type => 1,
+      :status => 1,
+      :tags => "hello, world",
+      :teams => "team",
+      :users => "users",
+      :mandatory => 0,
+      :release_type => 0,
+      :private => true,
+      :commit_sha => "123",
+      :build_server_url => "hello.com",
+      :repository_url => "world.com"
+    }
+
+    @deployer = Tug::Hockeyapp.new(@options)
+  end
+
+  describe "when deploying" do
+
+    it "should send to hockeyapp" do
+      expect(IO).to receive(:popen).with(/https:\/\/rink.hockeyapp.net\/api\/2\/apps\/upload/)
+      @deployer.deploy
+    end
+    
+    it "should send the ipa as a param" do
+      expect(IO).to receive(:popen).with(/-F "ipa=@test.ipa"/)
+      @deployer.deploy
+    end
+
+    it "should have some release notes" do
+      expect(IO).to receive(:popen).with(/-F notes='Notes'/)
+      @deployer.deploy
+    end
+
+    it "should have some a notes type" do
+      expect(IO).to receive(:popen).with(/-F "notes_type=1"/)
+      @deployer.deploy
+    end
+
+    it "should have some a status" do
+      expect(IO).to receive(:popen).with(/-F "status=1"/)
+      @deployer.deploy
+    end
+
+    it "should have tags" do
+      expect(IO).to receive(:popen).with(/-F "tags=hello, world"/)
+      @deployer.deploy
+    end
+
+    it "should send the api token as a param" do
+      expect(IO).to receive(:popen).with(/-H "X-HockeyAppToken: api_token"/)
+      @deployer.deploy
+    end
+
+    it "should have teams" do
+      expect(IO).to receive(:popen).with(/-F "teams=team"/)
+      @deployer.deploy
+    end
+
+    it "should have users" do
+      expect(IO).to receive(:popen).with(/-F "users=users"/)
+      @deployer.deploy
+    end
+
+    it "should have a mandatory key" do
+      expect(IO).to receive(:popen).with(/-F "mandatory=0"/)
+      @deployer.deploy
+    end
+
+    it "should have a release_type" do
+      expect(IO).to receive(:popen).with(/-F "release_type=0"/)
+      @deployer.deploy
+    end
+
+    it "should have a private key" do
+      expect(IO).to receive(:popen).with(/-F "private=true"/)
+      @deployer.deploy
+    end
+
+    it "should have a commit_sha" do
+      expect(IO).to receive(:popen).with(/-F "commit_sha=123"/)
+      @deployer.deploy
+    end
+
+    it "should have a build_server_url" do
+      expect(IO).to receive(:popen).with(/-F "build_server_url=hello.com"/)
+      @deployer.deploy
+    end
+
+    it "should have a repository_url" do
+      expect(IO).to receive(:popen).with(/-F "repository_url=world.com"/)
+      @deployer.deploy
+    end
+  end
+end

data/spec/ipa_command_spec.rb

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

data/spec/testflight_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Tug::Testflight do
+
+  before(:each) do
+    @options = {
+      :api_token => "api_token",
+      :team_token => "team_token",
+      :file => "test.ipa",
+      :notify => true,
+      :release_notes => "Notes"
+    }
+
+    @deployer = Tug::Testflight.new(@options)
+  end
+
+  describe "when deploying" do
+
+    it "should send to testflight by default" do
+      expect(IO).to receive(:popen).with(/http:\/\/testflightapp.com\/api\/builds.json/)
+      @deployer.deploy
+    end
+
+    it "should send the ipa as a param" do
+      expect(IO).to receive(:popen).with(/-F file=@test.ipa/)
+      @deployer.deploy
+    end
+
+    it "should send the team token as a param" do
+      expect(IO).to receive(:popen).with(/-F team_token='team_token'/)
+      @deployer.deploy
+    end
+
+    it "should send the api token as a param" do
+      expect(IO).to receive(:popen).with(/-F api_token='api_token'/)
+      @deployer.deploy
+    end
+
+    it "should have some release notes" do
+      expect(IO).to receive(:popen).with(/-F notes='Notes'/)
+      @deployer.deploy
+    end
+
+    it "should have lists" do
+      expect(IO).to receive(:popen).with(/-F distribution_lists=''/)
+      @deployer.deploy
+    end
+
+    it "should notify" do
+      expect(IO).to receive(:popen).with(/-F notify=true/)
+      @deployer.deploy
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tug
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Alex Fish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -107,8 +107,10 @@ files:
 - lib/tug/config/config_file.rb
 - lib/tug/config/missing_config_file.rb
 - lib/tug/deployment/deployer.rb
+- lib/tug/deployment/hockeyapp.rb
 - lib/tug/deployment/notes_file_parser.rb
 - lib/tug/deployment/notes_parser.rb
+- lib/tug/deployment/testflight.rb
 - lib/tug/interface/interface.rb
 - lib/tug/keychain/keychain.rb
 - lib/tug/project/project.rb
@@ -121,6 +123,7 @@ files:
 - spec/command_spec.rb
 - spec/config_file_spec.rb
 - spec/deployer_spec.rb
+- spec/hockapp_spec.rb
 - spec/ipa_command_spec.rb
 - spec/keychain_spec.rb
 - spec/notes_file_parser_spec.rb
@@ -129,6 +132,7 @@ files:
 - spec/release_notes_spec.rb
 - spec/spec_helper.rb
 - spec/test_notes.txt
+- spec/testflight_spec.rb
 - spec/xctool_spec.rb
 - tug.gemspec
 homepage: https://github.com/alexfish/tug
@@ -160,6 +164,7 @@ test_files:
 - spec/command_spec.rb
 - spec/config_file_spec.rb
 - spec/deployer_spec.rb
+- spec/hockapp_spec.rb
 - spec/ipa_command_spec.rb
 - spec/keychain_spec.rb
 - spec/notes_file_parser_spec.rb
@@ -168,4 +173,5 @@ test_files:
 - spec/release_notes_spec.rb
 - spec/spec_helper.rb
 - spec/test_notes.txt
+- spec/testflight_spec.rb
 - spec/xctool_spec.rb