mesmerize 0.0.6 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mesmerize (0.0.6)
+    mesmerize (0.1.0)
       commander (~> 4.1.2)
       faraday (~> 0.8.0)
       faraday_middleware (~> 0.8.7)

data/bin/mesmerize

@@ -4,7 +4,6 @@ require 'commander/import'
 
 $:.push File.expand_path("../../lib", __FILE__)
 require 'mesmerize'
-require 'mesmerize/commands'
 
 HighLine.track_eof = false # Fix for built-in Ruby
 
@@ -12,8 +11,10 @@ program :version, Mesmerize::VERSION
 program :description, 'A command-line interface for Mesmerize'
 
 program :help, 'Author', 'Mattt Thompson <m@mattt.me>'
-program :help, 'Website', 'http://mesmerizeapp.com'
+program :help, 'Website', 'https://mesmerizeapp.com'
 program :help_formatter, :compact
 
-global_option '--verbose'
+# global_option '--verbose'
 default_command :help
+
+require 'mesmerize/commands'

data/lib/mesmerize/client.rb

@@ -66,11 +66,7 @@ module Mesmerize
       end
     end
 
-    def post_release(app, release, file)
-      params = {
-        :version => release.to_s
-      }
-
+    def post_release(app, params, file)
       @connection.post("/api/apps/#{app}/releases", params).on_complete do |env|
         if (200...300).include? env[:status]
           params = env[:body]["params"]

data/lib/mesmerize/commands/build.rb

@@ -0,0 +1,86 @@
+command :build do |c|
+  c.syntax = 'mesmerize build [options] [output]'
+  c.summary = 'Create a new build of your app'
+  c.description = ''
+
+  c.example 'description', 'mesmerize release 478 --tag 3.7.2 --scheme MyApp+Sparkle'
+  c.option '-w', '--workspace WORKSPACE', 'Workspace (.xcworkspace) file to use to build app (automatically detected in current directory)'
+  c.option '-p', '--project PROJECT', 'Project (.xcodeproj) file to use to build app (automatically detected in current directory, overridden by --workspace option, if passed)'
+  c.option '-s', '--scheme SCHEME', 'Scheme used to build app'
+  c.option '-q', '--quiet', 'Silence warning and success messages'
+
+  c.action do |args, options|
+    require_authorization!
+    validate_xcode_version!
+
+    begin
+      @xcodebuild_info = Mesmerize::XcodeBuildInfo.info
+
+      @workspace = options.workspace
+      @project = options.project
+      @scheme = options.scheme
+
+      determine_workspace_or_project! unless @workspace || @project
+
+      determine_scheme! unless @scheme
+      say_error "Scheme #{@scheme} not found" and abort unless @xcodebuild_info.schemes.include?(@scheme)
+
+      say_warning "Building \"#{@workspace || @project}\" with scheme \"#{@scheme}\"\n" unless options.quiet
+
+      destination = File.join("/tmp/mesmerize/", "#{@xcodebuild_info.project}-#{Time.now.to_i}")
+      log "xcodebuild", (@workspace || @project)
+
+      opts = []
+      opts << "-workspace '#{@workspace}'" if @workspace
+      opts << "-project '#{@project}'" if @project
+      opts << "-scheme '#{@scheme}'" if @scheme
+
+      ["DSTROOT", "DWARF_DSYM_FOLDER_PATH", "CONFIGURATION_BUILD_DIR"].each do |k|
+        opts << "#{k}=#{destination}"
+      end
+      opts << "DEPLOYMENT_LOCATION=YES"
+
+      ENV['CC'] = nil # Fix for RVM
+      abort unless system "xcodebuild -sdk macosx #{opts.join(' ')} clean build 1> /dev/null"
+
+      app = Dir["#{destination}/**/*.app"].detect{|app| File.basename(app, ".app") == @xcodebuild_info.project}
+      say_error "Could not find build product in #{destination}" and abort unless app
+
+      output = args.pop || "./"
+      say_error "Could not move #{app} to #{output}" and abort unless system "mv #{app} #{output}"
+      say_ok "#{File.basename(app)} successfully built" unless options.quiet
+    end
+  end
+
+  private
+
+  def determine_workspace_or_project!
+    workspaces, projects = Dir["*.xcworkspace"], Dir["*.xcodeproj"]
+
+    if workspaces.empty?
+      if projects.empty?
+        say_error "No Xcode projects or workspaces found in current directory" and abort
+      else
+        if projects.length == 1
+          @project = projects.first
+        else
+          @project = choose "Select a project:", *projects
+        end
+      end
+    else
+      if workspaces.length == 1
+        @workspace = workspaces.first
+      else
+        @workspace = choose "Select a workspace:", *workspaces
+      end
+    end
+  end
+
+  def determine_scheme!
+    if @xcodebuild_info.schemes.length == 1
+      @scheme = @xcodebuild_info.schemes.first
+    else
+      @scheme = choose "Select a scheme:", *@xcodebuild_info.schemes
+    end
+  end
+end

data/lib/mesmerize/commands/release.rb

@@ -1,121 +1,82 @@
 command :release do |c|
-  c.syntax = 'mesmerize release [VERSION] [options]'
+  c.syntax = 'mesmerize release [options]'
   c.summary = 'Release a new build of your app'
   c.description = ''
 
   c.example 'description', 'mesmerize release 478 --tag 3.7.2 --scheme MyApp+Sparkle'
   c.option '-a', '--app APP', 'Name of App'
-  c.option '-t', '--tag TAG', 'Marketing Version Number (e.g. 3.7.2)'
+  c.option '-r', '--build BUILD', Integer, "Build Version Number (CFBundleVersion, e.g. 2663)"
+  c.option '-t', '--tag TAG', 'Marketing Version Number (CFBundleShortVersionString, e.g. 3.7.2)'
   c.option '-w', '--workspace WORKSPACE', 'Workspace (.xcworkspace) file to use to build app (automatically detected in current directory)'
   c.option '-p', '--project PROJECT', 'Project (.xcodeproj) file to use to build app (automatically detected in current directory, overridden by --workspace option, if passed)'
   c.option '-s', '--scheme SCHEME', 'Scheme used to build app'
+  c.option '-m', '--release-notes NOTES', 'Notes for this release'
 
   c.action do |args, options|
     require_authorization!
+    validate_xcode_version!
 
     begin
-      @info = Mesmerize::XcodeBuildInfo.info
-      
-      @appName = options.app || @info.project
-      @version = args.shift.to_i
-      @tag = options.tag
-      @workspace = options.workspace
-      @project = options.project
-      @scheme = options.scheme
-
-      @appSlug = @appName.strip.gsub(/\s+/, '-')
-
-      say "Found project \"#{@appName}\"."
-      say "Looking up current release information..."
-
-      response = client.get_app(@appSlug)
-      if response.status == 404
-        say_error "Could not find listing for #{@appName}." and say_error "Do `mesmerize create #{@appName}` first." and abort
-      end
-
-      @app = response.body
-      if @version.nonzero?
-        if @version <= @app["version"].to_i
-          say_error "Specified release (#{@version}) must be greater than current release (#{@app["version"]})" and abort
-        end
-      else
-        if @app["version"]
-          @version = @app["version"] + 1
-          say_warning "Bumping release to version #{@version}"
-        elsif Mesmerize::Agvtool.vers
-          @version = Mesmerize::Agvtool.vers + 1
-          say_warning "Bumping release to version #{@version}"
-        else
-          say_error "Specify a release version" and abort
-        end
-      end
+      @xcodebuild_info = Mesmerize::XcodeBuildInfo.info
 
-      unless @workspace || @project
-        workspaces, projects = Dir["*.xcworkspace"], Dir["*.xcodeproj"]
-        abort "No Xcode projects or workspaces found in current directory" if workspaces.empty? && projects.empty?
-
-        case workspaces.length
-        when 0
-          case projects.length
-          when 0
-            abort "No Xcode projects or workspaces found in current directory"
-          when 1
-            @project = projects.first
-          else
-            @project = choose "Select a project:", *projects
-          end
-        when 1
-          @workspace = workspaces.first
-        else
-          @workspace = choose "Select a workspace:", *workspaces
-        end
-      end
+      @app = options.app
+      @build_number = options.build
+      @tag = options.tag
 
-      if @scheme and not @info.schemes.include?(@scheme)
-        abort "Scheme #{@scheme} not found"
-      end
+      @release_notes = options.release_notes
 
-      if @scheme.nil?
-        @scheme = choose "Select a scheme:", *@info.schemes
-      end
+      determine_current_release_information!
 
-      ENV['CC'] = nil # Fix for rvm
+      determine_build_number! unless @build_number
+      validate_build_number!
+      
+      determine_tag! unless @tag
+      validate_tag!
 
-      puts
-      say "Building \"#{@workspace || @project}\" version #{@version} with scheme \"#{@scheme}\"\n"
+      determine_release_notes! unless @release_notes
 
       log "agvtool", "new-version"
-      `agvtool -noscm new-version -all #{@version}`
+      `agvtool -noscm new-version -all #{@build_number}`
 
       if @tag
         log "agvtool", "new-marketing-version"
         `agvtool -noscm new-marketing-version #{@tag}`
       end
 
-      [:clean, :build, :archive, :install].each do |action|
-        log "xcodebuild", action
+      @filename = "#{@app["name"]}-#{@build_number}.zip"
 
-        options = []
-        options << "-workspace '#{@workspace}'" if @workspace
-        options << "-project '#{@project}'" if @project
-        options << "-scheme '#{@scheme}'" if @scheme
+      # Un-parsing and passing options to `build` command
+      cargs = options.__hash__.keep_if{|k, v| [:workspace, :project, :scheme].include?(k)}
+      command(:build).run(*cargs.collect{|k, v| "--#{k} #{v}"}, "-q", "#{File.basename(@filename, '.zip')}.app")
 
-        `xcodebuild #{options.join(" ")} -sdk macosx DSTROOT='./.mesmerize' #{action}`# 1> /dev/null 2> /dev/null`
-      end
+      abort unless system "zip -rmTq #{@filename} #{File.basename(@filename, '.zip')}.app"
 
+      log "upload", @filename
+      
+      params = {
+        :version => @build_number.to_s,
+        :description => @release_notes,
+        :tag => @tag
+      }
 
-      @filename = "#{@app['name']}-#{@version}.zip"
-      `pushd .mesmerize/Applications; zip -r #{@filename} #{@app['name']}.app; popd`
+      client.post_release(@app["slug"], params, @filename) do |status, body|
+        case status
+        when 200...300, nil
+          log "publish appcast.xml"
 
-      @file = ".mesmerize/Applications/" + @filename
+          log "delete #{@filename}"
+          system "rm -f #{File.basename(@filename, '.zip')}.*"
 
-      log "upload", @filename
+          puts
+          say_ok "Successfully created release, #{@app["name"]} r#{@build_number}"
+
+          url = "https://#{@app["slug"]}.#{Mesmerize::Client::HOSTNAME}"
+          say "See the updated appcast at #{url}/appcast.xml"
 
-      client.post_release(@appSlug, @version, @file) do |status, body|
-        if (200...300).include?(status) || status.nil?
-          say_ok "Successfully created release, #{@app['name']} r#{@version}"
+          puts
+          say "Download the latest version at #{url}/latest"
         else
-          abort "Unable to create release"
+          say_error "Error creating release: #{body}" and abort
         end
       end
     rescue Mesmerize::XcodeBuildInfo::NilOutputError
@@ -124,8 +85,65 @@ command :release do |c|
       say_error "Xcode Build Error: #{e}" and abort
     rescue => e
       say_error "Error: #{e}" and abort
-    ensure
-      `rm -rf .mesmerize`
     end
   end
-end
+
+  private
+
+  def validate_xcode_version!
+    version = Mesmerize::XcodeBuildInfo.version
+    say_error "Mesmerize requires Xcode 4 (found #{version}). Please install or switch to the latest Xcode." and abort if version < "4.0.0"
+  end
+
+  def validate_build_number!
+    version = @app["version"].to_i
+    if version and @build_number and @build_number <= version
+      say_error "Specified build number (#{@build_number}) must be greater than current release (#{version})" and abort
+    end
+  end
+  
+  def validate_tag!
+    # TODO
+  end
+
+  def determine_current_release_information!
+    name = @app || @xcodebuild_info.project
+
+    say "Found project \"#{name}\"."
+    say "Looking up current release information..."
+
+    response = client.get_app(name.gsub(/\s+/, '-'))
+    case response.status
+    when 200...300
+      @app = response.body
+    when 404
+      say_error "Could not find listing for #{name}." and say_error "Do `mesmerize create #{@app["name"]}` first." and abort
+    else
+      say_error "Error finding listing for #{name}: #{response.body}" and abort
+    end
+  end
+
+  def determine_build_number!
+    version = @app["version"].to_i
+    if version.nonzero?
+      @build_number = version + 1
+      say_warning "Bumping release to version #{@build_number}"
+    elsif Mesmerize::Agvtool.vers
+      @build_number = Mesmerize::Agvtool.vers + 1
+      say_warning "Bumping release to version #{@build_number}"
+    else
+      @build_number = ask_for_integer "Specify a build number (CFBundleVersion)"
+    end
+  end
+  
+  def determine_tag!
+    @tag = Mesmerize::Agvtool.mvers
+  end
+
+  def determine_release_notes!
+    placeholder = %{What's new in this release: }
+    
+    @release_notes = ask_editor placeholder
+    @release_notes = nil if @release_notes == placeholder
+  end
+end

data/lib/mesmerize/commands.rb

@@ -6,4 +6,5 @@ require 'commands/signup'
 require 'commands/login'
 require 'commands/logout'
 require 'commands/create'
-require 'commands/release'
+require 'commands/build'
+require 'commands/release'

data/lib/mesmerize/xcodebuildinfo.rb

@@ -2,22 +2,22 @@ require 'ostruct'
 
 module Mesmerize::XcodeBuildInfo
   class Info < OpenStruct; end
-  
+
   class Error < StandardError; end
   class NilOutputError < Error; end
-  
+
   class << self
     def info
       output = `xcodebuild -list 2> /dev/null`
       raise Error.new $1 if /^xcodebuild\: error\: (.+)$/ === output
       raise NilOutputError unless /\S/ === output
-      
+
       lines = output.split(/\n/)
       hash = {}
       group = nil
-      
+
       hash[:project] = lines.shift.match(/\"(.+)\"\:/)[1]
-      
+
       lines.each do |line|
         if /\:$/ === line
           group = line.strip[0...-1].downcase.gsub(/\s+/, '-')
@@ -29,8 +29,13 @@ module Mesmerize::XcodeBuildInfo
           hash[group] << line.strip
         end
       end
-      
+
       Info.new(hash)
     end
+
+    def version
+      output = `xcodebuild -version`
+      output.scan(/([\d\.?]+)/).flatten.first rescue nil
+    end
   end
 end

data/lib/mesmerize.rb

@@ -1,5 +1,5 @@
 module Mesmerize
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 end
 
 $:.push File.expand_path('../', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mesmerize
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000Z
+date: 2012-06-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70335819400880 !ruby/object:Gem::Requirement
+  requirement: &70094542236220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70335819400880
+  version_requirements: *70094542236220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70335819400320 !ruby/object:Gem::Requirement
+  requirement: &70094542235720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70335819400320
+  version_requirements: *70094542235720
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70335819399800 !ruby/object:Gem::Requirement
+  requirement: &70094542235260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70335819399800
+  version_requirements: *70094542235260
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70335819399080 !ruby/object:Gem::Requirement
+  requirement: &70094542234800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.7.3
   type: :runtime
   prerelease: false
-  version_requirements: *70335819399080
+  version_requirements: *70094542234800
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70335819389480 !ruby/object:Gem::Requirement
+  requirement: &70094542234340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70335819389480
+  version_requirements: *70094542234340
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70335819388920 !ruby/object:Gem::Requirement
+  requirement: &70094542233880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *70335819388920
+  version_requirements: *70094542233880
 - !ruby/object:Gem::Dependency
   name: netrc
-  requirement: &70335819388360 !ruby/object:Gem::Requirement
+  requirement: &70094542233420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70335819388360
+  version_requirements: *70094542233420
 description: Command-Line Interface for Mesmerize
 email: m@mattt.me
 executables:
@@ -100,6 +100,7 @@ files:
 - ./lib/mesmerize/agvtool.rb
 - ./lib/mesmerize/authentication.rb
 - ./lib/mesmerize/client.rb
+- ./lib/mesmerize/commands/build.rb
 - ./lib/mesmerize/commands/create.rb
 - ./lib/mesmerize/commands/login.rb
 - ./lib/mesmerize/commands/logout.rb
@@ -126,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3606515878359033241
+      hash: -3338072577465810837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3606515878359033241
+      hash: -3338072577465810837
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15