motion-rubberstamp 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e73596661dda135a369015be51b33506ee2b7315
-  data.tar.gz: a03d5fb671385ad48b8f39b208579e0e556a0935
+  metadata.gz: 348217ce8090219bffa05a868cdde6444c52c0f5
+  data.tar.gz: ecd308178bdf0f6d2a4a8257680b11db2d2f1ba1
 SHA512:
-  metadata.gz: 42c3ad2a8fba5cf48df1017c78c11b538a9bcd3664dbb5f79b5cc90deb5cb8d915408c0208fc82383e08502da49d977678649571eeca18fd5c2b0807e38c11ba
-  data.tar.gz: 10a53c9418f69698f20e336819bb728aea3fade3faf231e2ec6d32a4ad70e3369956c38d30ef542980bcbc9ff89576db9248413b7c90fb1f69bdb594dc7917c7
+  metadata.gz: 0b1c82428177a42e8e6acba426e47c965909462efe7c8c032336e337b86e7eff965a2cb726e9e2c6fc395072c8bd8d37f21f5daebaee7a75cfe2abcbe8b84ebc
+  data.tar.gz: b7db682ff1966a7ecbaf826fb1aef8b8a811afd7bb2ebaee9b1beb3eb572e296bdb95dccdbe62f103df231f3cbbd120cda2c08538459880271efe6b0649d45ae

data/README.md

@@ -62,15 +62,10 @@ Or to remove the overlays and restore your original icons, you can run
 
 ## Notes
 
-The iOS Simulator will appear to cache your app icons when you run a
-build because RubyMotion's deployer apparently only looks for new resource
-files when deploying (it copies resource files to a simulator directory on 
-your local filesystem). Motion-rubberstamp is still invoked, but it won't 
-appear to update on your simulator. Deleting the app on your simulator 
-before building will invoke the refresh but is a non-optimal solution. I 
-hope to have this solved in the next release.
-
-Motion-rubberstamp also currently only checks for app icons in the `/resources`
+The iOS Simulator is trying to cache your app icons.  For this reason we've put in a significant refresh step!
+Your app data and simulator are restarted on restamp.  It's a small but notable necessary evil.
+
+Motion-rubberstamp _currently_ only checks for app icons in the `/resources`
 path, regardless of what your Rakefile is configured for.
     
 ## Uninstalling

data/lib/motion/project/rubberstamp.rb

@@ -1,5 +1,7 @@
 require 'pathname'
 require 'fileutils'
+require 'motion/project/app'
+require 'motion/project/config'
 
 # Gratuitously lifted from Laurent Sansonetti's motion-testflight.
 unless defined?(Motion::Project::Config)
@@ -9,20 +11,22 @@ end
 namespace :rubberstamp do
   desc "Stamp iOS app icons with version and git information"
   def process_icon(icon_name, caption)
-    # There's probably a better way to get this info, I'm not terribly familiar with Ruby's filesystem libs
-
     # Resolve icon's full path
     pwd = Pathname.pwd
     filename = "#{pwd.realdirpath.to_s}/#{icon_name}"
 
     if File.exist? filename
-      width= `identify -format '%w' #{filename}`.to_i
-      new_filename = filename.gsub('_base', '')
-      status = `convert -background '#0008' -fill white -gravity center -size #{width}x30\
-                caption:"#{caption}"\
-                #{filename} +swap -gravity south -composite #{new_filename}`
+      width= `identify -format '%w' #{filename}`
+      height = (width.to_i * 0.4).to_i
+      width = (width.to_i)
+      if width >= 57
+        new_filename = filename.gsub('_base', '')
+        status = `convert -background '#0008' -fill white -gravity center -size #{width.to_i}x#{height} \
+                  caption:'#{caption}' \
+                  #{filename} +swap -gravity south -composite #{new_filename}`
+      end
     else
-      puts "File does not exist, you broke it."
+      App.info "motion-rubberstamp", "File does not exist, you broke it."
     end
   end
 
@@ -32,25 +36,52 @@ namespace :rubberstamp do
     prexisting_base_icons.include?(true)
   end
 
+  # stub to check if the app needs to be restamped or not.
+  def updated?
+    true
+  end
+
+  # delete old app!
+  def wipe
+    app = App.config.app_bundle('iPhoneSimulator')
+    target = ENV['target'] || App.config.sdk_version
+    sim_apps = File.expand_path("~/Library/Application Support/iPhone Simulator/#{target}/Applications")
+    Dir.glob("#{sim_apps}/**/*.app").each do |app_bundle|
+      if File.basename(app_bundle) == File.basename(app)
+        p "Deleting #{app_bundle}"
+        rm_rf File.dirname(app_bundle)
+        break
+      end
+    end
+  end
+
   task :run do
-    # Automatically run install on first run
-    Rake::Task["rubberstamp:install"].execute unless installed?
-
-    # piggyback on RubyMotion's own app config tool
-    project_config_vars = Motion::Project::App.config.variables
-    app_version = project_config_vars['version']
-    # execute shell commands to get git info
-    git_commit  = `git rev-parse --short HEAD`
-    git_branch  = `git rev-parse --abbrev-ref HEAD`
-
-    caption = "v#{app_version} #{git_commit} #{git_branch}"
-    # process_icon("Icon_base.png", caption)
-    # process_icon("Icon@2x_base.png", caption)
-    # process_icon("Icon-72_base.png", caption)
-    # process_icon("Icon-72@2x_base.png", caption)
-    App.info "motion-rubberstamp", "Rubberstamping icons..."
-    Dir.glob('resources/*_base.png').each do |icon|
-      process_icon(icon, caption)
+
+    if updated?
+      # Clean old out the simulator
+      Rake::Task["rubberstamp:sim_clean"].execute
+      # Automatically run install on first run
+      Rake::Task["rubberstamp:install"].execute unless installed?
+
+      # piggyback on RubyMotion's own app config tool
+      project_config_vars = Motion::Project::App.config.variables
+      app_version = project_config_vars['version']
+      # execute shell commands to get git info
+      git_commit  = `git rev-parse --short HEAD`
+      git_branch  = `git rev-parse --abbrev-ref HEAD`
+
+      caption = "v#{app_version} #{git_commit.strip} #{git_branch.strip}"
+      # process_icon("Icon_base.png", caption)
+      # process_icon("Icon@2x_base.png", caption)
+      # process_icon("Icon-72_base.png", caption)
+      # process_icon("Icon-72@2x_base.png", caption)
+      App.info "motion-rubberstamp", "Rubberstamping icons..."
+      Dir.glob('resources/*_base.png').each do |icon|
+        process_icon(icon, caption)
+      end
+
+    else
+      App.info "motion-rubberstamp", "No change detected"
     end
   end
 
@@ -76,6 +107,16 @@ namespace :rubberstamp do
     end
   end
 
+  desc "Deletes app and kills the simulator (for cache reasons)"
+  task :sim_clean do
+    App.info "motion-rubberstamp", "Deleting App from simulator for new icons."
+    wipe
+    scripts_dir = File.join(File.dirname(__FILE__), "scripts")
+    close_script = File.expand_path(File.join(scripts_dir, "close_simulator.applescript"))
+
+    system("osascript #{close_script}")
+  end
+
 end
 
 # Make rubberstamp run before any build

data/lib/motion/project/scripts/close_simulator.applescript

@@ -0,0 +1,15 @@
+tell application "iPhone Simulator"
+    activate
+end tell
+
+tell application "System Events"
+    tell process "iPhone Simulator"
+        tell menu bar 1
+            tell menu bar item "iOs Simulator"
+                tell menu "iOs Simulator"
+                    click menu item "Quit iOS Simulator"
+                end tell
+            end tell
+        end tell
+    end tell
+end tell

data/lib/rubberstamp/version.rb

@@ -1,4 +1,4 @@
 module Rubberstamp
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-rubberstamp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matt Garrison
@@ -52,6 +52,7 @@ files:
 - Rakefile
 - lib/motion-rubberstamp.rb
 - lib/motion/project/rubberstamp.rb
+- lib/motion/project/scripts/close_simulator.applescript
 - lib/rubberstamp/version.rb
 - motion-rubberstamp.gemspec
 homepage: http://github.com/iconoclastlabs/motion-rubberstamp