seagull 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecc9260e1b3aa34c1b0015a86c624b3a2a2fec2a
-  data.tar.gz: b5a8bb852559bbd0a715dcb89752c9f933cbf0ce
+  metadata.gz: 6b8088508eb222e6dbd12ea9d61609d79374c629
+  data.tar.gz: 29105cddf546db9ebf3f78960a378a60dcefd956
 SHA512:
-  metadata.gz: a4a6a1dc1bb795feb679b6d0fa38bb99ccdc7d11433713aa9a17ee2001c3c9edab6a0d01b28cfcf1e1d94de8dfa04aa2399592339ab1893fd361ec5d554b1852
-  data.tar.gz: aafc517eb22bd5bcbc87f849ea2ec5f9af9056f1153ecb2d77c8c37ec69ba4b07d7884d5c701b13b8365608d50c376b42087b15ad2ad9f09fa8144de3bf03cdc
+  metadata.gz: e723faa16b6e1fd0ccbfae25db8afc265d447e0cbb4dfc467df81708e749ee67498557823165372afe8b73ebffcd1ed8363377c6ef96114027cdc755faf4b406
+  data.tar.gz: 431b6099e09a506c5b7343490ea9f96c37b87b61d7cbfc14e68074d8a0c5e4cf1438f07778cc3a233d95f04c4ad8fcf9f48e7ee4feef035f4554adf875b53663

data/lib/seagull/configuration.rb

@@ -108,7 +108,7 @@ module Seagull
     end
     
     def full_version
-      "#{marketing_version}.#{version}"
+      "#{marketing_version}-#{version}"
     end
     
     def version_tag
@@ -132,5 +132,15 @@ module Seagull
       
       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
 end

data/lib/seagull/deployment_strategies/file.rb

@@ -13,22 +13,29 @@ module Seagull
       end
 
       def deploy
-        # Make sure destionation directoy exists
-        FileUtils.mkpath(@configuration.deploy.path) unless ::File.directory?(@configuration.deploy.path)
+        # Make sure destionation directory exists
+        unless ::File.directory?(@configuration.deploy.path)
+          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")
           FileUtils.rm deploy_path if ::File.exists?(deploy_path)
-          system("/usr/bin/zip --symlinks --recurse-paths #{Shellwords.escape(deploy_path)} #{Shellwords.escape(@configuration.archive_file_name(release_type: @configuration.active_release_type))}")
+          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),
         ].each do |f|
+          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

data/lib/seagull/tasks.rb

@@ -7,7 +7,7 @@ require 'seagull/configuration'
 
 module Seagull
   class Tasks < ::Rake::TaskLib
-    def initialize(namespace = :seagull, &block)
+    def initialize(namespace = '', &block)
       @configuration = Configuration.new
       @namespace     = namespace
       
@@ -27,168 +27,177 @@ module Seagull
     
   private
     def define
-      # Detect some defaults
-      namespace(@namespace) do
-        task :clean do
-          unless @configuration.skip_clean
-            xctool @configuration.build_arguments, "clean"
-          end
+      if @namespace and !@namespace.empty?
+        namespace(@namespace) do
+          define_tasks
+        end
+      else
+        define_tasks
+      end
+    end
+    
+    def define_tasks
+      task :clean do
+        unless @configuration.skip_clean
+          xctool @configuration.build_arguments, "clean"
         end
+      end
 
-        desc "Build and run tests"
-        task test: [] do
-          xctool @configuration.build_arguments(configuration: @configuration.configuration.debug, arch: 'i386', sdk: 'iphonesimulator'), "clean", "test", "-freshInstall", "-freshSimulator"
+      desc "Build and run tests"
+      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 dependencies
-        @configuration.configuration.to_hash.each do |type, conf|
-          file @configuration.archive_full_path(type) do
-            xctool @configuration.build_arguments(configuration: conf), "archive", "-archivePath", Shellwords.escape(@configuration.archive_full_path(type))
+        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
+            sh("/usr/bin/zip --symlinks --verbose --recurse-paths '#{@configuration.dsym_full_path(type)}' .")
           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)]
         
-          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
+          desc "Package the #{type} version as an IPA file"
+          task package: [@configuration.ipa_full_path(type), @configuration.dsym_full_path(type)]
           
-          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
-              sh("/usr/bin/zip --symlinks --verbose --recurse-paths '#{@configuration.dsym_full_path(type)}' .")
+          if @configuration.deployment_strategies
+            desc "Prepare your app for deployment"
+            task prepare: ['git:verify', :package] do
+              @configuration.deployment_strategy(type).prepare
             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
-              desc "Prepare your app for deployment"
-              task prepare: ['git:verify', :package] do
-                @configuration.deployment_strategy(type).prepare
-              end
-          
-              desc "Deploy the beta using your chosen deployment strategy"
-              task deploy: [:prepare] do
-                @configuration.deployment_strategy(type).deploy
-              end
-          
-              desc "Deploy the last build"
-              task redeploy: [:prepre, :deploy]
+            desc "Deploy the beta using your chosen deployment strategy"
+            task deploy: [:prepare] do
+              @configuration.deployment_strategy(type).deploy
             end
-            
+        
+            desc "Deploy the last build"
+            task redeploy: [:prepre, :deploy]
           end
           
-          desc "Build, package and deploy beta build"
-          task type => ["#{type}:deploy"] do
-          end
         end
         
-        # Version control
-        namespace(:version) do
-          desc "Bumps build number"
-          task bump: ['git:verify:dirty'] do
-            sh("agvtool bump -all")
-            @configuration.reload_version!
-            
-            # Edit changelog
-            Rake::Task["#{@namespace}:changelog:edit"].invoke
-            Rake::Task["#{@namespace}:version:commit"].invoke
-            Rake::Task["#{@namespace}:version:tag"].invoke
-          end
+        desc "Build, package and deploy beta build"
+        task type => ["#{type}:deploy"] do
+        end
+      end
+      
+      # Version control
+      namespace(:version) do
+        desc "Bumps build number"
+        task bump: ['git:verify:dirty'] do
+          sh("agvtool bump -all")
+          @configuration.reload_version!
           
-          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
+          # Edit changelog
+          Rake::Task["changelog:edit"].invoke
+          Rake::Task["version:commit"].invoke
+          Rake::Task["version:tag"].invoke
+        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'))}
           
-          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
+          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
-        
-        namespace(:changelog) do
-          desc "Edit changelog for current version"
-          task :edit do
-            changelog = if File.exists?(@configuration.changelog_file)
-              File.read(@configuration.changelog_file)
-            else
-              ""
-            end
+      end
+      
+      namespace(:changelog) do
+        desc "Edit changelog for current version"
+        task :edit do
+          changelog = if File.exists?(@configuration.changelog_file)
+            File.read(@configuration.changelog_file)
+          else
+            ""
+          end
 
-            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 @configuration.full_version
-                io.puts "**#{@configuration.full_version} / #{tag_date.strftime('%Y-%m-%d')}**"
-                io.puts ""
-                %w{FIXED SECURITY FEATURE ENHANCEMENT PERFORMANCE}.each do |kw|
-                  io.puts " * **#{kw}** Describe changes here or remove if not required"
-                end
-                io.puts ""
+          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)
+              io.puts "**#{@configuration.full_version} / #{tag_date.strftime('%Y-%m-%d')}**"
+              io.puts ""
+              %w{FIXED SECURITY FEATURE ENHANCEMENT PERFORMANCE}.each do |kw|
+                io.puts " * **#{kw}** Describe changes here or remove if not required"
               end
-              io.puts changelog
+              io.puts ""
             end
-            sh("#{ENV['EDITOR']} CHANGELOG.md")
+            io.puts changelog
           end
+          sh("#{ENV['EDITOR']} CHANGELOG.md")
         end
-        
-        namespace(:git) do
-          namespace(:verify) do
-            # Verify GIT tag
-            task :tag do
-              current_tag = %x{git describe --exact-match `git rev-parse HEAD` 2>/dev/null}.strip
-              unless current_tag == @configuration.version_tag
-                puts ""
-                puts Term::ANSIColor.red("!!! Current commit is not properly tagged in GIT. Please tag and release version.")
-                puts ""
+      end
+      
+      namespace(:git) do
+        namespace(:verify) do
+          # Verify GIT tag
+          task :tag do
+            current_tag = %x{git describe --exact-match `git rev-parse HEAD` 2>/dev/null}.strip
+            unless current_tag == @configuration.version_tag
+              puts ""
+              puts Term::ANSIColor.red("!!! Current commit is not properly tagged in GIT. Please tag and release version.")
+              puts "Or specify IGNORE_GIT_TAG=1 environmental variable to skip this check."
+              puts ""
 
-                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?
-                puts ""
-                puts Term::ANSIColor.red("!!! Current GIT tree is dirty. Please commit changes before building release.")
-                puts ""
-                
-                fail unless ENV['IGNORE_GIT_DIRTY']
-              end
+              fail unless ENV['IGNORE_GIT_TAG']
             end
           end
           
-          task verify: ['verify:tag', 'verify:dirty']
+          # Verify dirty
+          task :dirty do
+            unless %x{git status -s --ignore-submodules=dirty 2> /dev/null}.empty?
+              puts ""
+              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
         
-        def xctool(*args)
-          sh("#{@configuration.xctool_path} #{args.join(" ")}")
-        end
-
-        def xcodebuild(*args)
-          sh("#{@configuration.xcodebuild_path} #{args.join(" ")} | xcpretty -c; exit ${PIPESTATUS[0]}")
-        end
+        task verify: ['verify:tag', 'verify:dirty']
       end
     end
 
+    def xctool(*args)
+      sh("#{@configuration.xctool_path} #{args.join(" ")}")
+    end
+
+    def xcodebuild(*args)
+      sh("#{@configuration.xcodebuild_path} #{args.join(" ")} | xcpretty -c; exit ${PIPESTATUS[0]}")
+    end
+    
     def git_directory
       original_cwd = Dir.pwd
 

data/lib/seagull/version.rb

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

data/seagull.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '~> 2.0'
+
   spec.add_dependency "rake",           "~> 10.1"
   spec.add_dependency "xcpretty",       "~> 0.1.3"
   spec.add_dependency "app_conf",       "~> 0.4.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seagull
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mikko Kokkonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -180,9 +180,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -195,3 +195,4 @@ signing_key:
 specification_version: 4
 summary: Manage Xcode projects with total control
 test_files: []
+has_rdoc: