Merge branch 'develop'

fastlane-old · Jan 15, 2015 · a8fc261 · a8fc261
2 parents 82989b1 + 748c57b
commit a8fc261
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 36 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    frameit (0.1.5)
+    frameit (0.2.0)
       colored
       commander (~> 4.2.0)
-      deliver (~> 0.3)
+      deliver (> 0.3)
       fastimage (~> 1.6.3)
       highline (~> 1.6.21)
       json
@@ -21,20 +21,25 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     cliver (0.3.2)
-    codeclimate-test-reporter (0.4.3)
+    codeclimate-test-reporter (0.4.5)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     colored (1.2)
     commander (4.2.1)
       highline (~> 1.6.11)
-    deliver (0.3.7)
+    credentials_manager (0.1.0)
+      colored
+      highline (~> 1.6.21)
+      security (~> 0.1.3)
+    deliver (0.5.0)
       capybara (~> 2.4.3)
       colored
       commander (~> 4.2.0)
+      credentials_manager
       fastimage (~> 1.6.3)
       highline (~> 1.6.21)
       json
-      nokogiri (~> 1.6.3.1)
+      nokogiri (~> 1.6.5)
       plist (~> 3.1.0)
       poltergeist (~> 1.5.1)
       prawn
@@ -44,15 +49,15 @@ GEM
     fastimage (1.6.6)
       addressable (~> 2.3, >= 2.3.5)
     highline (1.6.21)
-    json (1.8.1)
+    json (1.8.2)
     method_source (0.8.2)
     mime-types (2.4.3)
     mini_magick (3.8.1)
       subexec (~> 0.2.1)
-    mini_portile (0.6.0)
+    mini_portile (0.6.2)
     multi_json (1.10.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     pdf-core (0.4.0)
     plist (3.1.0)
     poltergeist (1.5.1)
@@ -67,8 +72,8 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.4.2)
     rspec (3.1.0)
@@ -93,7 +98,9 @@ GEM
     slop (3.6.0)
     subexec (0.2.3)
     ttfunk (1.4.0)
-    websocket-driver (0.4.0)
+    websocket-driver (0.5.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yard (0.8.7.6)

diff --git a/README.md b/README.md
@@ -1,28 +1,35 @@
+<h3 align="center">
+  <a href="https://github.com/KrauseFx/fastlane">
+    <img src="assets/fastlane.png" width="150" />
+    <br />
+    fastlane
+  </a>
+</h3>
 <p align="center">
-  <a href="https://github.com/KrauseFx/deliver">Deliver</a> &bull; 
-  <a href="https://github.com/KrauseFx/snapshot">Snapshot</a> &bull; 
-  <b>FrameIt</b> &bull; 
+  <a href="https://github.com/KrauseFx/deliver">deliver</a> &bull; 
+  <a href="https://github.com/KrauseFx/snapshot">snapshot</a> &bull; 
+  <b>frameit</b> &bull; 
   <a href="https://github.com/KrauseFx/PEM">PEM</a> &bull; 
-  <a href="https://github.com/KrauseFx/sigh">Sigh</a>
+  <a href="https://github.com/KrauseFx/sigh">sigh</a>
 </p>
 -------
 
 <p align="center">
     <img src="assets/frameit.png">
 </p>
 
-FrameIt - Add gorgeous device frames around your screenshots
+frameit
 ============
 
 [![Twitter: @KauseFx](https://img.shields.io/badge/[email protected]?style=flat)](https://twitter.com/KrauseFx)
 [![License](http://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/KrauseFx/frameit/blob/master/LICENSE)
 [![Gem](https://img.shields.io/gem/v/frameit.svg?style=flat)](http://rubygems.org/gems/frameit)
 
-Want a device frame around your screenshot? Do it in an instant!
+###### Quickly put your screenshots into the right device frames
 
-This library is not supposed to be used for App Store screenshots.
+This tool is not supposed to be used for App Store screenshots. Instead it should be used to prepare screenshots for websites, emails and prints.
 
-Follow the developer on Twitter: [@KrauseFx](https://twitter.com/KrauseFx)
+Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/KrauseFx)
 
 
 -------
@@ -35,6 +42,8 @@ Follow the developer on Twitter: [@KrauseFx](https://twitter.com/KrauseFx)
 </p>
 
 -------
+<h5 align="center"><code>frameit</code> is part of <a href="http://fastlane.tools">fastlane</a>: connect all deployment tools into one streamlined workflow.</h5>
+
 
 
 # Features
@@ -61,7 +70,7 @@ Install the gem
 
     sudo gem install frameit
 
-Because of legal reasons, I can not pre-package the device frames with ```FrameIt```.
+Because of legal reasons, I can not pre-package the device frames with ```frameit```.
 
 The process of adding is really easy, just run ```frameit``` and the guide will help you set it up.
 You only have to do this once per computer.
@@ -91,12 +100,13 @@ To run the setup process again to add new frames use:
 
 # Tips
 
-## Other helpful tools
-Check out other tools in this collection to speed up your deployment process:
-- [```deliver```](https://github.com/KrauseFx/deliver): Deploy screenshots, app metadata and app updates to the App Store using just one command
-- [```snapshot```](https://github.com/KrauseFx/snapshot): Create hundreds of screenshots of your iPhone app... while doing something else
-- [```PEM```](https://github.com/KrauseFx/pem): Tired of manually creating and maintaining your push certification profiles?
-- [```sigh```](https://github.com/KrauseFx/sigh): Because you would rather spend your time building stuff than fighting provisioning.
+## [`fastlane`](http://fastlane.tools) Toolchain
+
+- [`fastlane`](http://fastlane.tools): Connect all deployment tools into one streamlined workflow
+- [`deliver`](https://github.com/KrauseFx/deliver): Upload screenshots, metadata and your app to the App Store using a single command
+- [`snapshot`](https://github.com/KrauseFx/snapshot): Automate taking localized screenshots of your iOS app on every device
+- [`PEM`](https://github.com/KrauseFx/pem): Automatically generate and renew your push notification profiles
+- [`sigh`](https://github.com/KrauseFx/sigh): Because you would rather spend your time building stuff than fighting provisioning
 
 ## Generate screenshots
 Check out [```Snapshot```](https://github.com/KrauseFx/snapshot) to automatically generate screenshots using ```UI Automation```.
@@ -109,7 +119,7 @@ You can use [SimulatorStatusMagic](https://github.com/shinydevelopment/Simulator
 - ```rm -rf ~/.frameit```
 
 # Need help?
-- If there is a technical problem with ```FrameIt```, submit an issue. Run ```frameit --trace``` to get the stacktrace.
+- If there is a technical problem with ```frameit```, submit an issue. Run ```frameit --trace``` to get the stacktrace.
 - I'm available for contract work - drop me an email: [email protected]
 
 # License

diff --git a/assets/fastlane.png b/assets/fastlane.png
diff --git a/bin/frameit b/bin/frameit
@@ -10,9 +10,9 @@ HighLine.track_eof = false
 
 # Commander
 program :version, Frameit::VERSION
-program :description, 'Find all screenshots in current folder and put a nice frame around it. This will duplicate the images.'
-program :help, 'Author', 'Felix Krause <krausefx@gmail.com>'
-program :help, 'Website', 'http://felixkrause.at'
+program :description, 'Quickly put your screenshots into the right device frames'
+program :help, 'Author', 'Felix Krause <frameit@krausefx.com>'
+program :help, 'Website', 'http://fastlane.tools'
 program :help, 'GitHub', 'https://github.com/krausefx/frameit'
 program :help_formatter, :compact
 

diff --git a/frameit.gemspec b/frameit.gemspec
@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = Frameit::VERSION
   spec.authors       = ["Felix Krause"]
   spec.email         = ["[email protected]"]
-  spec.summary       = %q{FrameIt - Want a device frame around your screenshots? Do it in an instant!}
-  spec.description   = %q{Want a device frame around your iPhone app screenshots? Do it in an instant!}
-  spec.homepage      = "http://krausefx.com"
+  spec.summary       = %q{Quickly put your screenshots into the right device frames}
+  spec.description   = %q{Quickly put your screenshots into the right device frames}
+  spec.homepage      = "http://fastlane.tools"
   spec.license       = "MIT"
 
   spec.required_ruby_version = '>= 2.0.0'
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'commander', '~> 4.2.0' # CLI parser
   spec.add_dependency 'fastimage', '~> 1.6.3' # fetch the image sizes from the screenshots
   spec.add_dependency 'mini_magick', '~> 3.8.1' # To open, edit and export PSD files
-  spec.add_dependency 'deliver', '~> 0.3' # To determine the device type based on a screenshot file
+  spec.add_dependency 'deliver', '> 0.3' # To determine the device type based on a screenshot file
 
   # Development only
   spec.add_development_dependency 'bundler'

diff --git a/lib/frameit/version.rb b/lib/frameit/version.rb
@@ -1,3 +1,3 @@
 module Frameit
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end