flavours 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 114e509b32662c162de75b86d8dc2bebe9c0d60a
-  data.tar.gz: 9bdf076d9f6f133c5d125a898730ba0d1eaf579d
+  metadata.gz: edcd019cc082e2e4baf676a34e1d61ee9bf61969
+  data.tar.gz: 9850b6c15da1d8d722484c53c93ed89c27ef2664
 SHA512:
-  metadata.gz: 05e29447d992a6ea264a3f8f047a6b45da8f96a2035f7b6a47b5939708a7261d3c509dfda6ca3781f789dec45348ebdea782cb747972d4b9d780fcff2a1bd108
-  data.tar.gz: 377c43b96a2a529eaac9094cbc8819fd9dd39af3719366f63cb575efc1fee75f69322ec6101d98537238202d36e90a104a2e307e8303f6af0a921ed074bf5c63
+  metadata.gz: e7163dc4cc37e991f3947acd2169aee860d6be3283cc41e10d66505472355fe1e2ef5654088d6acff40d340abf46198634ba0a6f8a7b5bf5de34f9f5f191c062
+  data.tar.gz: 157a4f4bf6b7fa7cc9b392db0e0fd7a0c10665813d99b396ea7420e85c74fbed1ac7b5fcfb19c3963c3d261dd6f537109d0dcb7736a35b031753314236b4c64d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flavours (0.0.5)
+    flavours (0.0.7)
       bundler (~> 1.3)
       commander (~> 4.2)
       dotenv (~> 0.11)

data/README.md

@@ -8,7 +8,7 @@ One codebase. Multiple Google Play Store submissions with different icons, XML r
 
 ```
 $ flavours install
-$ flavours shoot
+$ flavours create
 ```
 
 **About**
@@ -25,7 +25,7 @@ Flavours requires your Android application use the Gradle build system.
 
 * [Installation](#installation)
 * [Set Up](#set-up)
-* [Formatting flavours.json](#formatting-flavours-json)
+* [Formatting flavours.json](#formatting-flavoursjson)
 * [Creating Flavors](#creating-flavors)
 * [The Future](#the-future)
 * [Contributing](#contributing)

data/lib/flavours/assets.rb

@@ -6,7 +6,7 @@ module Flavours
   end
 
   def self.assets_file_path directory, m, flavour_name
-    return "#{directory}/#{m}/src/#{flavour_name}/res"
+    return "#{directory}/#{m}/src/#{flavour_name.gsub(/[^0-9a-z ]/i, '')}/res"
   end
 
   def self.file_path_with_folder_name directory, folder, m, flavour_name

data/lib/flavours/gradle.rb

@@ -10,7 +10,7 @@ module Flavours
     @flavour_string = ''
     flavours.each do |f|
       @flavour_string += gradle_string_for_flavour f
-      Flavours::green "  #{f['flavourName']}" unless $nolog
+      Flavours::green "  #{f['flavourName'].gsub(/[^0-9a-z ]/i, '')}" unless $nolog
       Flavours::create_images directory, m, f
       Flavours::create_xml_resources directory, m, f
       puts
@@ -37,7 +37,7 @@ module Flavours
   def self.gradle_string_for_flavour flavour
     package = flavour['packageName'] ? "            packageName \"#{flavour['packageName']}\"\n" : ''
     buildConfig = flavour['buildConfig'] ? build_config_string_for_flavour(flavour) : ''
-    return "        #{flavour['flavourName']} {\n#{package}#{buildConfig}        }\n"
+    return "        #{flavour['flavourName'].gsub(/[^0-9a-z ]/i, '')} {\n#{package}#{buildConfig}        }\n"
   end
 
 

data/lib/flavours/images.rb

@@ -16,7 +16,7 @@ module Flavours
     end
 
     # Resize Icons
-    resize_icons directory, m, flavour_hash
+    resize_icons directory, m, flavour_hash if flavour_hash['iconURL'] || flavour_hash['iconPath']
   end
 
 
@@ -26,9 +26,10 @@ module Flavours
     name = flavour_hash['flavourName']
 
     # Get Image Information
-    img_path = ''
     if flavour_hash['iconUrl']
       img_path = self.path_for_downloaded_image_from_url directory, name, flavour_hash['iconUrl'], 'icons'
+    else
+      img_path = "#{directory}/#{flavour_hash['iconPath']}"
     end
 
     # Make Assets Directory

data/lib/flavours/version.rb

@@ -1,5 +1,5 @@
 module Flavours
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 
   def self.check_for_newer_version
     unless Gem.latest_version_for('flavours').to_s == VERSION

data/lib/flavours/xmlres.rb

@@ -48,6 +48,6 @@ module Flavours
   # Resource String
   def self.res_string res, name, value, type
     type_string = type ? " type=\"#{type}\"" : ''
-    return "        <#{res} name=\"#{name}\"#{type_string}>#{value}</#{res}>\n"
+    return "        <#{res} name=\"#{name}\"#{type_string}>#{value.sub("'", "\\'")}</#{res}>\n"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flavours
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Ben Gordon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler