longbow 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05bd9d17c6b502aea639b84c1ebdece5bb04b9ec
-  data.tar.gz: b402bb6a47291e68c5530e24cf73755845f57d08
+  metadata.gz: 86277771094b698394dba33a73564319e357dbe8
+  data.tar.gz: 515898e907ed93a454e3f2d2e7fa9d0878d216a0
 SHA512:
-  metadata.gz: 2fbde0674131935d8aaa3af4a05c5f2dfc4e0cfc21a85bd444a6a1ac381ecf098884a1c22c85e8821d54e9541187985e418e112bc342237c7d70e5bb5f550edf
-  data.tar.gz: 3c246f41f7edc165bb9573e7974c81e370874a35427cb90c64ff350a2eeec0b7da945a75cca191fbf99474755874238ccb04df1813be157c891b1f5ff0846a99
+  metadata.gz: 3cf79384286e062107efcb024ff46fa929408df39a5d403c2ee405bffe37f5c90fc4fcabd80e5ed4488c5a8b4003cd3c3b1893e159045cf4b92d4c11e2bfc47f
+  data.tar.gz: 56698aaefc70ed3d0026018cbd9087639d013bcd621e8028256881aa303e373333187505e2852026c2349dd5aa75f90cbd5e8798bf143e99cd12d593e7e19d39

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    longbow (0.1.0)
+    longbow (0.1.1)
       bundler (~> 1.3)
       commander (~> 4.1)
       dotenv (~> 0.7)

data/lib/longbow/commands/shoot.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'longbow/colors'
 require 'longbow/targets'
 require 'longbow/images'
+require 'longbow/json'
 require 'json'
 
 command :shoot do |c|
@@ -11,6 +12,7 @@ command :shoot do |c|
   c.description = ''
   c.option '-n', '--name NAME', 'Target name from the corresponding longbow.json file.'
   c.option '-d', '--directory DIRECTORY', 'Path where the .xcodeproj or .xcworkspace file && the longbow.json file live.'
+  c.option '-u', '--url URL', 'URL of a longbow formatted JSON file.'
 
   c.action do |args, options|
     # Check for newer version
@@ -19,23 +21,21 @@ command :shoot do |c|
     # Set Up
     @target_name = options.name ? options.name : nil
     @directory = options.directory ? options.directory : Dir.pwd
+    @url = options.url ? options.url : nil
     @targets = []
 
-    # Check for .longbow.json
-    @json_path = @directory + '/longbow.json'
-    if !File.exists?(@json_path)
-      Longbow::red "\n  Couldn't find longbow.json at #{@json_path}\n"
-      puts "  Run this command to install the correct files:\n  longbow install\n"
-      next
+    # Create JSON object
+    if @url
+      obj = Longbow::json_object_from_url @url
+    else
+      obj = Longbow::json_object_from_directory @directory
     end
 
-    # Create an Object from JSON
-    json_contents = File.open(@json_path).read
-    unless !!JSON.parse(json_contents)
-      Longbow::red '  Invalid JSON - lint it, and try again.'
+    # Break if Bad
+    unless obj
+      Longbow::red "\n Invalid JSON. Please lint the file, and try again.\n"
       next
     end
-    obj = JSON.parse(json_contents)
 
     # Check for Target Name
     if @target_name
@@ -48,9 +48,7 @@ command :shoot do |c|
         next
       end
     else
-      obj['targets'].each do |t|
-        @targets << t
-      end
+      @targets = obj['targets']
     end
 
     # Begin

data/lib/longbow/images.rb

@@ -69,7 +69,6 @@ module Longbow
     target = t['name']
 
     ['launch_phone_p', 'launch_phone_l', 'launch_tablet_p', 'launch_tablet_l'].each do |key|
-      img_path = ''
       if t[key + '_url']
         img_path = self.path_for_downloaded_image_from_url directory, key + '_' + target, t[key + '_url'], 'launch'
       elsif t[key + '_path']

data/lib/longbow/json.rb

@@ -0,0 +1,42 @@
+$:.push File.expand_path('../', __FILE__)
+require 'colors'
+require 'open-uri'
+require 'json'
+
+module Longbow
+
+  def self.json_object_from_directory directory
+    return nil unless directory
+
+    # Check for longbow.json
+    @json_path = directory + '/longbow.json'
+    unless File.exists?(@json_path)
+      Longbow::red "\n  Couldn't find longbow.json at #{@json_path}\n"
+      puts "  Run this command to install the correct files:\n  longbow install\n"
+      return nil
+    end
+
+    # Create hash from longbow.json
+    json_contents = File.open(@json_path).read
+    return json_object_from_string json_contents
+  end
+
+
+  def self.json_object_from_url url
+    return nil unless url
+    contents = ''
+    open(url) {|io| contents = io.read}
+    return json_object_from_string contents
+  end
+
+  def self.json_object_from_string contents
+    begin
+      !!JSON.parse(contents)
+    rescue
+      return nil
+    end
+
+    return JSON.parse(contents)
+  end
+
+end

data/lib/longbow/version.rb

@@ -2,7 +2,7 @@ $:.push File.expand_path('../', __FILE__)
 require 'colors'
 
 module Longbow
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
   def self.check_for_newer_version
     if `gem outdated -r`.include? 'longbow'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: longbow
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Intermark Interactive
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,6 +138,7 @@ files:
 - ./lib/longbow/commands/shoot.rb
 - ./lib/longbow/commands.rb
 - ./lib/longbow/images.rb
+- ./lib/longbow/json.rb
 - ./lib/longbow/plist.rb
 - ./lib/longbow/targets.rb
 - ./lib/longbow/version.rb