seagull 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b8088508eb222e6dbd12ea9d61609d79374c629
-  data.tar.gz: 29105cddf546db9ebf3f78960a378a60dcefd956
+  metadata.gz: 765e55b8c55b7e787bd317c7a1a862c5726d9b3a
+  data.tar.gz: 8cbbacd70f1a4d927610e134a764cb272a2fdbbd
 SHA512:
-  metadata.gz: e723faa16b6e1fd0ccbfae25db8afc265d447e0cbb4dfc467df81708e749ee67498557823165372afe8b73ebffcd1ed8363377c6ef96114027cdc755faf4b406
-  data.tar.gz: 431b6099e09a506c5b7343490ea9f96c37b87b61d7cbfc14e68074d8a0c5e4cf1438f07778cc3a233d95f04c4ad8fcf9f48e7ee4feef035f4554adf875b53663
+  metadata.gz: 52911a38e114fc731da3be7f4441f1cd5018c98b67b163184fe7a5ee44774b935fce9eb6004e3153daf615d2738a8d4d85fb5c406493e97cdad684062248f4fe
+  data.tar.gz: 4e2bac6e110ea0c1638cda9e3df83eb49c46292718234536c2609c7b01696406c219adc156164876a1ba6bbb50fde8fa6fd8b4382e397515903c5a7fba41e070

data/lib/seagull/configuration.rb

@@ -12,9 +12,9 @@ module Seagull
         :build_dir       => 'build',
         :auto_archive    => true,
         :changelog_file  => File.expand_path('CHANGELOG.md'),
-        :archive_path    => File.expand_path("~/Library/Developer/Xcode/Archives"),
-        :ipa_path        => File.expand_path("~/Library/Developer/Xcode/Archives"),
-        :dsym_path       => File.expand_path("~/Library/Developer/Xcode/Archives"),
+        :archive_path    => File.expand_path("~/Library/Developer/Xcode/Archives/#{Time.now.strftime('%Y-%m-%d')}"),
+        :ipa_path        => nil,
+        :dsym_path       => nil,
         :xcpretty        => true,
         :xctool_path     => "xctool",
         :xcodebuild_path => "xcodebuild",
@@ -25,18 +25,18 @@ module Seagull
         :skip_clean      => false,
         :verbose         => false,
         :dry_run         => false,
-        
+
         :deploy                => {
           :release_notes_items => 5,
         },
         :release_type          => :beta,
         :deployment_strategies => {},
       })
-      
+
       self.load('.seagull.yml') if File.exists?(".seagull.yml")
       self.from_hash(defaults)
     end
-    
+
     # Configuration
     def deployment(release_type, strategy_name, &block)
       if DeploymentStrategies.valid_strategy?(strategy_name.to_sym)
@@ -53,40 +53,40 @@ module Seagull
       self.active_release_type = type
       self.deployment_strategies.send(type)
     end
-    
+
     # Accessors
     def archive_name
       app_name || target || scheme
     end
-    
+
     def archive_file_name(override = {})
       "#{archive_name}-#{full_version}_#{configuration.send(override.fetch(:release_type, release_type))}.xcarchive"
     end
-    
+
     def archive_full_path(type)
       File.join(archive_path, archive_file_name(release_type: type))
     end
-    
+
     def ipa_name
       app_name || target || scheme
     end
-    
+
     def ipa_file_name(override = {})
       "#{archive_name}-#{full_version}_#{configuration.send(override.fetch(:release_type, release_type))}.ipa"
     end
-    
+
     def ipa_full_path(type)
-      File.join(ipa_path, ipa_file_name(release_type: type))
+      File.join(ipa_path, ipa_file_name(release_type: type)) if ipa_path
     end
-    
+
     def dsym_file_name(override = {})
       "#{archive_name}-#{full_version}_#{configuration.send(override.fetch(:release_type, release_type))}.dSYM.zip"
     end
-    
+
     def dsym_full_path(type)
-      File.join(dsym_path, dsym_file_name(release_type: type))
+      File.join(dsym_path, dsym_file_name(release_type: type)) if dsym_path
     end
-    
+
     def version_data
       @version_data ||= begin
         vers    = %x{agvtool vers -terse|tail -1}.strip
@@ -94,27 +94,27 @@ module Seagull
         {marketing: mvers, version: vers}
       end
     end
-    
+
     def reload_version!
       @version_data = nil; version_data
     end
-    
+
     def marketing_version
       version_data[:marketing]
     end
-    
+
     def version
       version_data[:version]
     end
-    
+
     def full_version
       "#{marketing_version}-#{version}"
     end
-    
+
     def version_tag
       "v#{full_version}"
     end
-    
+
     def build_arguments(override = {})
       args = {}
       if workspace
@@ -127,19 +127,19 @@ module Seagull
 
       args[:configuration] = configuration.send(release_type)
       args[:arch]          = arch unless arch.nil?
-      
+
       args.merge!(override)
-      
+
       args.collect{|k,v| "-#{k} #{Shellwords.escape(v)}"}
     end
-    
+
     def environment_for(release_type)
       env = []
       if release_type == 'release'
         env << 'CODE_SIGN_IDENTITY=""'
         env << 'CODE_SIGNING_REQUIRED=NO'
       end
-      
+
       env
     end
   end

data/lib/seagull/deployment_strategies.rb

@@ -21,28 +21,28 @@ module Seagull
 
       def configure(&block)
         @configuration.deploy.from_hash(defaults)
-        
+
         yield @configuration.deploy
       end
-      
+
       def defaults
         {}
       end
-      
+
       def prepare
         puts "Nothing to prepare!"
       end
-      
+
       def deploy
         raise "NOT IMPLEMENTED"
       end
-      
+
       def release_notes
         changelog = ::File.exists?(@configuration.changelog_file) ? ::File.read(@configuration.changelog_file) : ""
 
         parser = Vandamme::Parser.new(changelog: changelog, version_header_exp: '^\*\*?([\w\d\.-]+\.[\w\d\.-]+[a-zA-Z0-9])( \/ (\d{4}-\d{2}-\d{2}|\w+))?\*\*\n?[=-]*', format: 'markdown')
         changes = parser.parse
-        
+
         changes.first(@configuration.deploy.release_notes_items).collect{|v, c| "**#{v}**\n\n#{c}" }.join("\n\n")
       end
     end
@@ -50,11 +50,11 @@ module Seagull
     private
 
     def self.strategies
-      {:file => File, :hockeyapp => HockeyApp}
+      {:file => File, :hockeyapp => HockeyApp, :crashlytics => Crashlytics}
     end
   end
 end
 
 require 'seagull/deployment_strategies/file'
 require 'seagull/deployment_strategies/hockey_app'
-
+require 'seagull/deployment_strategies/crashlytics'

data/lib/seagull/deployment_strategies/crashlytics.rb

@@ -0,0 +1,33 @@
+require 'tempfile'
+require 'json'
+require 'launchy'
+
+module Seagull
+  module DeploymentStrategies
+    class Crashlytics < DeploymentStrategy
+
+      # Nothing to prepare
+      def prepare
+        unless @configuration.deploy.crashlytics_location
+          if dir = ['./', 'Pods/CrashlyticsFramework'].find{|d| ::File.directory?("#{d}/Crashlytics.framework")}
+            @configuration.deploy.crashlytics_location = "#{dir}/Crashlytics.framework"
+          end
+        end
+        raise "Please provide Crashlytics location" unless ::File.directory?(@configuration.deploy.crashlytics_location)
+      end
+
+      def deploy
+        cmd = []
+        cmd <<"#{@configuration.deploy.crashlytics_location}/submit"
+        cmd << @configuration.deploy.api_key
+        cmd << @configuration.deploy.build_secret
+        cmd << "-ipaPath #{Shellwords.escape(@configuration.ipa_full_path(@configuration.active_release_type))}"
+
+        require 'pry';binding.pry
+        system(cmd.join(' '))
+      end
+
+    private
+    end
+  end
+end

data/lib/seagull/deployment_strategies/file.rb

@@ -18,7 +18,7 @@ module Seagull
           puts "Creating #{@configuration.deploy.path}"
           FileUtils.mkpath(@configuration.deploy.path)
         end
-        
+
         # Copy xcarchive
         Dir.chdir(@configuration.archive_path) do
           deploy_path = ::File.join(@configuration.deploy.path, @configuration.archive_file_name(release_type: @configuration.active_release_type) + ".zip")
@@ -26,7 +26,7 @@ module Seagull
           puts "Creating XCArchive for deployment..."
           system("/usr/bin/zip --quiet --symlinks --recurse-paths #{Shellwords.escape(deploy_path)} #{Shellwords.escape(@configuration.archive_file_name(release_type: @configuration.active_release_type))}")
         end
-        
+
         [
           @configuration.ipa_full_path(@configuration.active_release_type),
           @configuration.dsym_full_path(@configuration.active_release_type),
@@ -34,10 +34,10 @@ module Seagull
           puts "Copying #{::File.basename(f)} for deployment..."
           FileUtils.cp_r f, @configuration.deploy.path
         end
-        
+
         puts "Deployed to #{@configuration.deploy.path}/#{@configuration.archive_file_name(release_type: @configuration.active_release_type)}"
       end
-      
+
       private
     end
   end

data/lib/seagull/deployment_strategies/hockey_app.rb

@@ -5,7 +5,7 @@ require 'launchy'
 module Seagull
   module DeploymentStrategies
     class HockeyApp < DeploymentStrategy
-      
+
       def defaults
         {
           :allow_download => true,
@@ -14,11 +14,11 @@ module Seagull
           :tags           => '',
         }
       end
-      
+
       # Nothing to prepare
       def prepare
       end
-      
+
       def deploy
         # Create response file
         response_file = Tempfile.new('seagull_deploy_hockey')
@@ -35,7 +35,7 @@ module Seagull
           repository_url: %x{git remote -v|grep fetch|awk '{print $2;}'}.strip,
         }
         opts = payload.collect{|k,v| "-F #{k}=#{Shellwords.escape(v)}"}.join(" ")
-        
+
         puts "Uploading to Hockeyapp... Please wait..."
         system("curl #{opts} -o #{response_file.path} -H 'X-HockeyAppToken: #{@configuration.deploy.token}' https://rink.hockeyapp.net/api/2/apps/#{@configuration.deploy.appid}/app_versions/upload")
 
@@ -54,7 +54,7 @@ module Seagull
       ensure
         response_file.unlink
       end
-      
+
     private
     end
   end

data/lib/seagull/tasks.rb

@@ -10,9 +10,9 @@ module Seagull
     def initialize(namespace = '', &block)
       @configuration = Configuration.new
       @namespace     = namespace
-      
+
       yield @configuration if block_given?
-      
+
       # Check we can find our xctool
       unless File.executable?(%x{which #{@configuration.xctool_path}}.strip)
         raise "xctool is required. Please install using Homebrew: brew install xctool."
@@ -21,10 +21,10 @@ module Seagull
       unless File.executable?(%x{which #{@configuration.xcodebuild_path}}.strip)
         raise "xcodebuild is required. Please install XCode."
       end
-      
+
       define
     end
-    
+
   private
     def define
       if @namespace and !@namespace.empty?
@@ -35,7 +35,7 @@ module Seagull
         define_tasks
       end
     end
-    
+
     def define_tasks
       task :clean do
         unless @configuration.skip_clean
@@ -47,17 +47,17 @@ module Seagull
       task test: [] do
         xctool @configuration.build_arguments(configuration: @configuration.configuration.debug, arch: 'i386', sdk: 'iphonesimulator'), "clean", "test", "-freshInstall", "-freshSimulator"
       end
-      
+
       # File dependencies
       @configuration.configuration.to_hash.each do |type, conf|
         file @configuration.archive_full_path(type) do
           xcodebuild @configuration.build_arguments(configuration: conf), "archive", "-archivePath", Shellwords.escape(@configuration.archive_full_path(type)), @configuration.environment_for(type)
         end
-      
+
         file @configuration.ipa_full_path(type) => @configuration.archive_full_path(type) do
           xcodebuild "-exportArchive", "-exportFormat", "ipa", "-archivePath", Shellwords.escape(@configuration.archive_full_path(type)), "-exportPath", Shellwords.escape(@configuration.ipa_full_path(type))
         end
-        
+
         file @configuration.dsym_full_path(type) => @configuration.archive_full_path(type) do
           dsym_path = File.expand_path(Dir["#{@configuration.archive_full_path(type)}/dSYMS/*"].first)
           Dir.chdir dsym_path do
@@ -65,67 +65,77 @@ module Seagull
           end
         end
       end
-      
+
       ['beta', 'release'].each do |type|
         namespace(type) do
           desc "Archive the #{type} version as an XCArchive file"
           task archive: [@configuration.archive_full_path(type)]
-        
+
           desc "Package the #{type} version as an IPA file"
           task package: [@configuration.ipa_full_path(type), @configuration.dsym_full_path(type)]
-          
+
           if @configuration.deployment_strategies
+            prepare_reqs = []
+            prepare_reqs << (type == 'beta' ? 'git:verify:dirty' : 'git:verify')
+            prepare_reqs << :package unless @configuration.ipa_path.nil? and @configuration.dsym_path.nil?
+
             desc "Prepare your app for deployment"
-            task prepare: ['git:verify', :package] do
-              @configuration.deployment_strategy(type).prepare
+            task prepare: prepare_reqs do
+              if @configuration.deployment_strategy(type)
+                @configuration.deployment_strategy(type).prepare
+              end
             end
-        
+
             desc "Deploy the beta using your chosen deployment strategy"
             task deploy: [:prepare] do
-              @configuration.deployment_strategy(type).deploy
+              if @configuration.deployment_strategy(type)
+                @configuration.deployment_strategy(type).deploy
+              end
             end
-        
+
             desc "Deploy the last build"
-            task redeploy: [:prepre, :deploy]
+            task redeploy: [:prepare, :deploy]
           end
-          
+
         end
-        
+
         desc "Build, package and deploy beta build"
-        task type => ["#{type}:deploy"] do
+        task type do
+          Rake::Task["version:bump"].invoke(type)
+          Rake::Task["#{type}:deploy"].invoke
         end
       end
-      
+
       # Version control
       namespace(:version) do
         desc "Bumps build number"
-        task bump: ['git:verify:dirty'] do
+        task :bump, [:type] => ['git:verify:dirty'] do |t, args|
           sh("agvtool bump -all")
           @configuration.reload_version!
-          
+
           # Edit changelog
           Rake::Task["changelog:edit"].invoke
           Rake::Task["version:commit"].invoke
-          Rake::Task["version:tag"].invoke
+          Rake::Task["version:tag"].invoke if args[:type] == 'release' or args[:type].nil?
         end
-        
+
         task :tag do
           current_tag = %x{git describe --exact-match `git rev-parse HEAD` 2>/dev/null}.strip
           unless current_tag == @configuration.version_tag
             sh("git tag -m 'Released version #{@configuration.full_version}' -s '#{@configuration.version_tag}'")
           end
         end
-        
+
         task :commit do
           ver_files = %x{git status --porcelain}.split("\n").collect{|a| Shellwords.escape(a.gsub(/[ AM\?]+ (.*)/, '\1'))}
-          
+
           Dir.chdir(git_directory) do
             sh("git add #{ver_files.join(' ')}")
             sh("git commit -m 'Bumped version to #{@configuration.full_version}' #{ver_files.join(' ')}")
           end
         end
       end
-      
+
       namespace(:changelog) do
         desc "Edit changelog for current version"
         task :edit do
@@ -137,11 +147,11 @@ module Seagull
 
           tag      = %x{git describe --exact-match `git rev-parse HEAD` 2>/dev/null}.strip
           tag_date = Date.parse(%x{git log -1 --format=%ai #{tag}})
-          
+
           # Parse current changelog
           parser = Vandamme::Parser.new(changelog: changelog, version_header_exp: '^\*\*?([\w\d\.-]+\.[\w\d\.-]+[a-zA-Z0-9])( \/ (\d{4}-\d{2}-\d{2}|\w+))?\*\*\n?[=-]*', format: 'markdown')
           changes = parser.parse
-          
+
           # Write entry to changelog
           File.open('CHANGELOG.md', 'w') do |io|
             unless changes.keys.include?(@configuration.full_version)
@@ -157,7 +167,7 @@ module Seagull
           sh("#{ENV['EDITOR']} CHANGELOG.md")
         end
       end
-      
+
       namespace(:git) do
         namespace(:verify) do
           # Verify GIT tag
@@ -172,7 +182,7 @@ module Seagull
               fail unless ENV['IGNORE_GIT_TAG']
             end
           end
-          
+
           # Verify dirty
           task :dirty do
             unless %x{git status -s --ignore-submodules=dirty 2> /dev/null}.empty?
@@ -180,12 +190,12 @@ module Seagull
               puts Term::ANSIColor.red("!!! Current GIT tree is dirty. Please commit changes before building release.")
               puts "Or specify IGNORE_GIT_DIRTY=1 environmental variable to skip this check."
               puts ""
-              
+
               fail unless ENV['IGNORE_GIT_DIRTY']
             end
           end
         end
-        
+
         task verify: ['verify:tag', 'verify:dirty']
       end
     end
@@ -197,7 +207,7 @@ module Seagull
     def xcodebuild(*args)
       sh("#{@configuration.xcodebuild_path} #{args.join(" ")} | xcpretty -c; exit ${PIPESTATUS[0]}")
     end
-    
+
     def git_directory
       original_cwd = Dir.pwd
 
@@ -208,9 +218,9 @@ module Seagull
         end
 
         Dir.chdir(original_cwd) and return if Pathname.new(Dir.pwd).root?
-        
+
         Dir.chdir('..')
       end
     end
   end
-end
+end

data/lib/seagull/version.rb

@@ -2,7 +2,7 @@ module Seagull
   class Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 2
+    PATCH = 3
 
     STRING = [MAJOR, MINOR, PATCH].join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seagull
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mikko Kokkonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -165,6 +165,7 @@ files:
 - lib/seagull.rb
 - lib/seagull/configuration.rb
 - lib/seagull/deployment_strategies.rb
+- lib/seagull/deployment_strategies/crashlytics.rb
 - lib/seagull/deployment_strategies/file.rb
 - lib/seagull/deployment_strategies/hockey_app.rb
 - lib/seagull/tasks.rb
@@ -190,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Manage Xcode projects with total control