hawk 0.1.0 → 0.2.0

data/hawk.gemspec

@@ -18,6 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency('aws-sdk', '~> 1.8')
-  gem.add_dependency('xcodeproj', '~> 0.4')
   gem.add_dependency('osx-plist', '~> 1.0')
 end

data/lib/hawk/builder.rb

@@ -7,6 +7,22 @@ module Hawk
       def signing_identity(identity)
         @signing_identity = identity
       end
+
+      def project(project)
+        @project = project
+      end
+
+      def workspace(workspace)
+        @workspace = workspace
+      end
+
+      def scheme(scheme)
+        @scheme = scheme
+      end
+
+      def configuration(configuration)
+        @configuration = configuration
+      end
     end
 
     def app_name
@@ -59,7 +75,8 @@ module Hawk
         output_dir = Dir.tmpdir
 
         print "Building Xcode project..."
-        output = `/usr/bin/xcodebuild CONFIGURATION_BUILD_DIR=#{output_dir} 2>&1`
+        output = `#{xcode_command} CONFIGURATION_BUILD_DIR=#{output_dir} 2>&1`
+
         if $?.to_i != 0
           puts "error (text follows)"
           abort output
@@ -76,7 +93,16 @@ module Hawk
     end
 
     def project_property(prop)
-      `/usr/bin/xcodebuild -showBuildSettings | grep "\s#{prop} = "`.gsub!(/.* = /, '').chomp
+      `#{xcode_command} -showBuildSettings | grep "\s#{prop} = " 2>&1`.gsub!(/.* = /, '').chomp
+    end
+
+    def xcode_command
+      options = []
+      options << "-project #{@project}" if @project
+      options << "-workspace #{@workspace}" if @workspace
+      options << "-scheme #{@scheme}" if @scheme
+      options << "-configuration #{@configuration || 'Release'}"
+      "/usr/bin/xcodebuild #{options.join(' ')}"
     end
   end
 end

data/lib/hawk/hawkifier.rb

@@ -15,7 +15,7 @@ module Hawk
 
     private
     def files
-      { 'Hawkfile' => ERB.new(File.read(File.join(File.dirname(__FILE__), '..', '..', 'templates', 'Hawkfile.erb'))).result }
+      { 'Hawkfile' => File.read(File.join(File.dirname(__FILE__), '..', '..', 'templates', 'Hawkfile')) }
     end
 
     def write_file_if_not_exist(name, contents)

data/lib/hawk/s3_uploader.rb

@@ -14,6 +14,10 @@ module Hawk
       def bucket_name(name)
         @bucket_name = name
       end
+
+      def delete_after(days)
+        @delete_after = days
+      end
     end
 
     def ipa_url
@@ -43,9 +47,16 @@ module Hawk
     private
 
     def object(name, &block)
-      s3 = AWS::S3.new(:access_key_id => @access_key_id, :secret_access_key => @secret_access_key)
-      bucket = s3.buckets.create @bucket_name
-      obj = bucket.objects[name]
+      prefix = "#{app_name}/#{app_version}/"
+      if !@bucket
+        @s3 ||= AWS::S3.new(:access_key_id => @access_key_id, :secret_access_key => @secret_access_key)
+        @bucket = @s3.buckets.create @bucket_name
+        @bucket.lifecycle_configuration.update do
+          remove_rule prefix
+          add_rule prefix, :id => prefix, :expiration_time => (@delete_after || 30)
+        end
+      end
+      obj = @bucket.objects["#{prefix}#{name}"]
       yield obj
       obj.acl = :public_read
       obj.public_url

data/lib/hawk/version.rb

@@ -1,3 +1,3 @@
 module Hawk
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/templates/{Hawkfile.erb → Hawkfile}

@@ -7,6 +7,19 @@
 #
 # The signing identity to sign your app with. Defaults to 'iPhone Distribution'
 #signing_identity 'iPhone Distribution'
+#
+# The project file to load (this is usually found automatically)
+#project 'SampleProject.xcodeproj'
+#
+# The workspace file to use (like project, this is usually found automatically)
+#workspace 'SampleWorkspace.xcworkspace'
+#
+# The scheme to build (required when building a workspace).
+# Run 'xcodebuild --workspace <workspace> -list' to see available schemes
+#scheme 'SampleApplication'
+#
+# The configuration to build. Defaults to 'Release'
+#configuration 'Release'
 
 #
 # AWS Credentials - used to upload your app and associated metadata into S3 so
@@ -15,6 +28,9 @@
 #access_key_id 'AAAAAAAAAAAAAAAAAAAA'
 #secret_access_key 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 #bucket_name 'mah-bukkit'
+#
+# How many days to wait before deleting the files from S3. Defaults to 30 days
+#delete_after 30
 
 #
 # User list - a list of users to send emails to upon successsful upload of a new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hawk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: xcodeproj
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: osx-plist
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +68,7 @@ files:
 - lib/hawk/notifier.rb
 - lib/hawk/s3_uploader.rb
 - lib/hawk/version.rb
-- templates/Hawkfile.erb
+- templates/Hawkfile
 - templates/manifest.plist.erb
 homepage: http://github.com/mtrudel/hawk
 licenses: []