flip_the_switch 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e4c3d08117d7df04e9f0b072c46ceaa37677bae
-  data.tar.gz: 129fd88d8381ebc2caac41d0cc28a52640043d2c
+  metadata.gz: 187de79fc4e08a0c688622eb4f1d32c1c2c4b342
+  data.tar.gz: 065bfce674a98f8e10ab1979a990aeac942366dc
 SHA512:
-  metadata.gz: aeb03d159b4a890318eea4976566d192c15c780558ec15eb2267047fd33f23891126acd287052d58f1a308fbd4414a8a19ec99fdcfb6107b30742f73940c02f0
-  data.tar.gz: 7120397022f1507790cd58763fc28fbb10fcc50d30ccf695eaeb21a7687474bd788c16bdb281b2d68accfc26eb01d375605955f32fb51bc8ac7eb61d42d22bb5
+  metadata.gz: 87eae7636b75e115dc65f4de6bf4691040a085dbfd0457451430fc8dc77cedb00e9c1163b18e66659fdbff3730b97aeee27b4cc6380eaf2ab3aa99e4f97bc9f4
+  data.tar.gz: 5f229faf45aa73ace7810d77ef6653f92b292ce11a0bf3de9116b392113febfa4462b98014e787b1929c255517babbb6e93790f370a947757db7096d0d041931

data/.gitignore

@@ -14,6 +14,12 @@
 #
 #########################
 
+#####
+# Coverage
+*.gcda
+*.gcno
+coverage/
+
 #####
 # Guard
 Guardfile

data/.travis.yml

@@ -1,9 +1,6 @@
 language: objective-c
 osx_image: xcode7
 before_install:
-    - brew update
-    - brew uninstall xctool
-    - brew install xctool
     - sudo easy_install cpp-coveralls
     - gem install bundler
     - bundle install

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.1 / 2015-11-02
+
+ * [ENHANCEMENT] Improve Readme/Cli usage
+ * [ENHANCEMENT] Remove activesupport dependency (helps with cocoapods support)
+
 # 1.0.0 / 2015-10-15
 
 *  [ENHANCEMENT] Using JSON instead of YAML for  features 

data/FlipTheSwitch.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'FlipTheSwitch'
-  s.version = '1.0.0'
+  s.version = '1.0.1'
   s.summary = 'A simple library to help enabling/disabling features on iOS/Mac applications.'
   s.authors = {
       'Michael England' => 'mg.england@gmail.com',

data/README.md

@@ -158,6 +158,7 @@ The features and subfeatures, along with their default enabled/disabled state, a
 		}
 	},
 	"beta": {
+		"inherits_from": "default",
 		"awesome_feature": {
 			"enabled": false
 		}

data/Tests/Rakefile

@@ -17,6 +17,6 @@ file podfile_lock do
 end
 
 task :test => podfile_lock do
-  sh "xctool test -scheme #{workspace}-Mac -workspace #{workspace}.xcworkspace -sdk macosx OBJROOT=#{build} SHARED_PRECOMPS_DIR=#{build}"
-  sh "xctool test -scheme #{workspace}-iOS -workspace #{workspace}.xcworkspace -sdk iphonesimulator OBJROOT=#{build} SHARED_PRECOMPS_DIR=#{build}"
+  sh "xcodebuild test -scheme #{workspace}-Mac -workspace #{workspace}.xcworkspace -sdk macosx OBJROOT=#{build} SHARED_PRECOMPS_DIR=#{build}"
+  sh "xcodebuild test -scheme #{workspace}-iOS -workspace #{workspace}.xcworkspace -sdk iphonesimulator OBJROOT=#{build} SHARED_PRECOMPS_DIR=#{build}"
 end

data/flip_the_switch.gemspec

@@ -4,10 +4,9 @@ Gem::Specification.new do |s|
   s.email = %w(mg.england@gmail.com rob@robsiwek.com)
   s.summary = 'A simple library to help enabling/disabling features on iOS/Mac applications.'
   s.homepage = 'https://github.com/michaelengland/FlipTheSwitch'
-  s.version = '1.0.0'
+  s.version = '1.0.1'
   s.license = 'MIT'
 
-  s.add_dependency 'activesupport', '~> 3.2'
   s.add_dependency 'thor', '~> 0.19'
   s.add_dependency 'plist', '~> 3.1'
   s.add_dependency 'json-schema', '~> 2.5'

data/lib/flip_the_switch/cli.rb

@@ -9,25 +9,25 @@ module FlipTheSwitch
     end
 
     public
-    class_option :input, type: :string, aliases: '-i', default: defaults[:input], desc: 'Filename or directory containing features.yml file to read'
-    class_option :environment, type: :string, aliases: '-n', default: defaults[:environment], desc: 'Name of environment to read from in features.yml file'
+    class_option :input, type: :string, aliases: '-i', default: defaults['input'], desc: 'Filename or directory containing features.json file to read'
+    class_option :environment, type: :string, aliases: '-n', default: defaults['environment'], desc: 'Name of environment to read from features.json file'
 
     desc 'plist', 'Auto-generates a Features.plist file for enabled/disabled features'
-    method_option :output, type: :string, aliases: '-o', default: defaults[:plist_output], desc: 'Filename or directory in which Features.plist file will be created'
+    method_option :output, type: :string, aliases: '-o', default: defaults['plist_output'], desc: 'Filename or directory in which Features.plist file will be created'
 
     def plist
       plist_generator.generate
     end
 
     desc 'category', 'Auto-generates .h & .m files for enabled/disabled features'
-    method_option :output, type: :string, aliases: '-o', default: defaults[:category_output], desc: 'Location of the directory in which FlipTheSwitch+Features.{h,m} files will be created'
+    method_option :output, type: :string, aliases: '-o', default: defaults['category_output'], desc: 'Location of the directory in which FlipTheSwitch+Features.{h,m} files will be created'
 
     def category
       category_generator.generate
     end
 
     desc 'settings', 'Auto-generates settings.bundle files for enabling/disabling features from iOS settings menu'
-    method_option :output, type: :string, aliases: '-o', default: defaults[:settings_output], desc: 'Location of the directory in which FlipTheSwitch+Features.{h,m} files will be created'
+    method_option :output, type: :string, aliases: '-o', default: defaults['settings_output'], desc: 'Location of the directory in which FlipTheSwitch+Features.{h,m} files will be created'
 
     def settings
       settings_generator.generate

data/lib/flip_the_switch/generator/category.rb

@@ -1,5 +1,4 @@
 require 'flip_the_switch/generator/base'
-require 'active_support/inflector'
 require 'erb'
 
 module FlipTheSwitch
@@ -29,7 +28,9 @@ module FlipTheSwitch
       end
 
       def delete_file(file)
-        File.delete(file) if File.exists?(file)
+        if File.exists?(file)
+          File.delete(file)
+        end
       end
 
       def header_file
@@ -75,6 +76,20 @@ module FlipTheSwitch
           feature_and_sub_features(sub_feature)
         }
       end
+
+      def lower_camelize(string)
+        str = camelize(string)
+        if str.empty?
+          ''
+        else
+          str[0] = str[0].downcase
+          str
+        end
+      end
+
+      def camelize(string)
+        string.split('_').each {|s| s.capitalize! }.join('')
+      end
     end
   end
 end

data/lib/flip_the_switch/generator/header.h.erb

@@ -6,12 +6,12 @@
 <% if feature.description -%>
 // <%= feature.description %>
 <% end -%>
-+ (BOOL)is<%= feature.name.camelize %>Enabled;
-+ (void)enable<%= feature.name.camelize %>;
-+ (void)disable<%= feature.name.camelize %>;
-+ (void)set<%= feature.name.camelize %>Enabled:(BOOL)enabled;
-+ (void)reset<%= feature.name.camelize %>;
-+ (NSString *)<%= feature.name.camelize(:lower) %>Key;
++ (BOOL)is<%= camelize(feature.name) %>Enabled;
++ (void)enable<%= camelize(feature.name) %>;
++ (void)disable<%= camelize(feature.name) %>;
++ (void)set<%= camelize(feature.name) %>Enabled:(BOOL)enabled;
++ (void)reset<%= camelize(feature.name) %>;
++ (NSString *)<%= lower_camelize(feature.name) %>Key;
 
 <% end -%>
 + (void)resetAll;

data/lib/flip_the_switch/generator/implementation.m.erb

@@ -4,37 +4,37 @@
 @implementation FTSFlipTheSwitch (Features)
 
 <% all_features.each do |feature| -%>
-+ (BOOL)is<%= feature.name.camelize %>Enabled
++ (BOOL)is<%= camelize(feature.name) %>Enabled
 {
 <% if feature.has_parent? -%>
-    return [self is<%= feature.parent_name.camelize %>Enabled] &&
-        [[FTSFlipTheSwitch sharedInstance] isFeatureEnabled:[self <%= feature.name.camelize(:lower) %>Key]];
+    return [self is<%= camelize(feature.parent_name) %>Enabled] &&
+        [[FTSFlipTheSwitch sharedInstance] isFeatureEnabled:[self <%= lower_camelize(feature.name) %>Key]];
 <% else -%>
-    return [[FTSFlipTheSwitch sharedInstance] isFeatureEnabled:[self <%= feature.name.camelize(:lower) %>Key]];
+    return [[FTSFlipTheSwitch sharedInstance] isFeatureEnabled:[self <%= lower_camelize(feature.name) %>Key]];
 <% end -%>
 }
 
-+ (void)enable<%= feature.name.camelize %>
++ (void)enable<%= camelize(feature.name) %>
 {
-    [[FTSFlipTheSwitch sharedInstance] enableFeature:[self <%= feature.name.camelize(:lower) %>Key]];
+    [[FTSFlipTheSwitch sharedInstance] enableFeature:[self <%= lower_camelize(feature.name) %>Key]];
 }
 
-+ (void)disable<%= feature.name.camelize %>
++ (void)disable<%= camelize(feature.name) %>
 {
-    [[FTSFlipTheSwitch sharedInstance] disableFeature:[self <%= feature.name.camelize(:lower) %>Key]];
+    [[FTSFlipTheSwitch sharedInstance] disableFeature:[self <%= lower_camelize(feature.name) %>Key]];
 }
 
-+ (void)set<%= feature.name.camelize %>Enabled:(BOOL)enabled
++ (void)set<%= camelize(feature.name) %>Enabled:(BOOL)enabled
 {
-    [[FTSFlipTheSwitch sharedInstance] setFeature:[self <%= feature.name.camelize(:lower) %>Key] enabled:enabled];
+    [[FTSFlipTheSwitch sharedInstance] setFeature:[self <%= lower_camelize(feature.name) %>Key] enabled:enabled];
 }
 
-+ (void)reset<%= feature.name.camelize %>
++ (void)reset<%= camelize(feature.name) %>
 {
-    [[FTSFlipTheSwitch sharedInstance] resetFeature:[self <%= feature.name.camelize(:lower) %>Key]];
+    [[FTSFlipTheSwitch sharedInstance] resetFeature:[self <%= lower_camelize(feature.name) %>Key]];
 }
 
-+ (NSString *)<%= feature.name.camelize(:lower) %>Key
++ (NSString *)<%= lower_camelize(feature.name) %>Key
 {
     return @"<%= feature.name %>";
 }
@@ -43,7 +43,7 @@
 + (void)resetAll
 {
 <% all_features.each do |feature| -%>
-    [self reset<%= feature.name.camelize %>];
+    [self reset<%= camelize(feature.name) %>];
 <% end -%>
 }
 

data/lib/flip_the_switch/generator/settings.rb

@@ -1,5 +1,4 @@
 require 'flip_the_switch/generator/base'
-require 'active_support/core_ext/hash/indifferent_access'
 require 'plist'
 
 module FlipTheSwitch
@@ -55,54 +54,54 @@ module FlipTheSwitch
       end
 
       def root
-        current_plist.with_indifferent_access.merge(PreferenceSpecifiers: root_preferences)
+        current_plist.merge('PreferenceSpecifiers' => root_preferences)
       end
 
       def root_preferences
         existing_root_preferences.delete_if { |root_preference|
-          root_preference[:Title] == 'Features'
+          root_preference['Title'] == 'Features'
         } + feature_root_preferences
       end
 
       def existing_root_preferences
-        current_plist.with_indifferent_access[:PreferenceSpecifiers] || []
+        current_plist['PreferenceSpecifiers'] || []
       end
 
       def feature_root_preferences
         [
-            {
-                Title: 'Features',
-                Type: 'PSGroupSpecifier'
-            },
-            {
-                File: 'Features',
-                Title: 'Features',
-                Type: 'PSChildPaneSpecifier'
-            }
+          {
+            'Title' => 'Features',
+            'Type' => 'PSGroupSpecifier'
+          },
+          {
+            'File' => 'Features',
+            'Title' => 'Features',
+            'Type' => 'PSChildPaneSpecifier'
+          }
         ]
       end
 
       def feature_properties
-        {PreferenceSpecifiers: feature_toggles}
+        {'PreferenceSpecifiers' => feature_toggles}
       end
 
       def feature_toggles
         features.map { |feature|
           {
-              Type: 'PSToggleSwitchSpecifier',
-              Title: feature.name,
-              Key: "FTS_FEATURE_#{feature.name}",
-              DefaultValue: feature.enabled
+            'Type' => 'PSToggleSwitchSpecifier',
+            'Title' => feature.name,
+            'Key' => "FTS_FEATURE_#{feature.name}",
+            'DefaultValue' => feature.enabled
           }
         }
       end
 
       def current_plist
         @current_plist ||= if File.exists?(root_plist)
-                             ::Plist::parse_xml(root_plist)
-                           else
-                             {}
-                           end
+          ::Plist::parse_xml(root_plist)
+        else
+          {}
+        end
       end
 
       def root_plist

data/lib/flip_the_switch/reader/defaults.rb

@@ -1,4 +1,4 @@
-require 'active_support/core_ext/hash/indifferent_access'
+require 'yaml'
 
 module FlipTheSwitch
   module Reader
@@ -7,7 +7,7 @@ module FlipTheSwitch
         if valid_file?
           base_defaults.merge(file_defaults)
         else
-          raise Error::InvalidFile.new(defaults_file)
+          raise Error::InvalidFile.new(defaults_file_name)
         end
       end
 
@@ -19,23 +19,25 @@ module FlipTheSwitch
 
       def base_defaults
         {
-            input: Dir.pwd,
-            environment: 'default',
-            enabled: '',
-            disabled: '',
-            category_output: Dir.pwd,
-            plist_output: Dir.pwd,
-            settings_output: Dir.pwd
-        }.with_indifferent_access
+          'input' => Dir.pwd,
+          'environment' => 'default',
+          'enabled' => '',
+          'disabled' => '',
+          'category_output' => Dir.pwd,
+          'plist_output' => Dir.pwd,
+          'settings_output' => Dir.pwd
+        }
       end
 
       def file_defaults
-        @file_defaults ||= YAML.load_file(defaults_file)
-      rescue SystemCallError
-        {}
+        @file_defaults ||= if File.exists?(defaults_file_name)
+          YAML.load(File.read(defaults_file_name))
+        else
+          {}
+        end
       end
 
-      def defaults_file
+      def defaults_file_name
         '.flip.yml'
       end
     end

data/spec/flip_the_switch/reader/defaults_spec.rb

@@ -12,32 +12,32 @@ describe FlipTheSwitch::Reader::Defaults do
     context 'when valid' do
       before do
         File.write(defaults_file, YAML.dump({
-            input: 'input',
-            environment: 'environment',
-            category_output: 'category_output',
-            plist_output: 'plist_output',
-            settings_output: 'settings_output'
+            'input' => 'input',
+            'environment' => 'environment',
+            'category_output' => 'category_output',
+            'plist_output' => 'plist_output',
+            'settings_output' => 'settings_output'
         }))
       end
 
       it 'returns file input default' do
-        expect(subject.defaults[:input]).to eql('input')
+        expect(subject.defaults['input']).to eql('input')
       end
 
       it 'returns file environment default' do
-        expect(subject.defaults[:environment]).to eql('environment')
+        expect(subject.defaults['environment']).to eql('environment')
       end
 
       it 'returns file category output default' do
-        expect(subject.defaults[:category_output]).to eql('category_output')
+        expect(subject.defaults['category_output']).to eql('category_output')
       end
 
       it 'returns file plist output default' do
-        expect(subject.defaults[:plist_output]).to eql('plist_output')
+        expect(subject.defaults['plist_output']).to eql('plist_output')
       end
 
       it 'returns file settings output default' do
-        expect(subject.defaults[:settings_output]).to eql('settings_output')
+        expect(subject.defaults['settings_output']).to eql('settings_output')
       end
     end
 
@@ -56,23 +56,23 @@ describe FlipTheSwitch::Reader::Defaults do
 
   context 'when defaults file does NOT exist' do
     it 'returns base input default' do
-      expect(subject.defaults[:input]).to eql(Dir.pwd)
+      expect(subject.defaults['input']).to eql(Dir.pwd)
     end
 
     it 'returns base environment default' do
-      expect(subject.defaults[:environment]).to eql('default')
+      expect(subject.defaults['environment']).to eql('default')
     end
 
     it 'returns base category output default' do
-      expect(subject.defaults[:category_output]).to eql(Dir.pwd)
+      expect(subject.defaults['category_output']).to eql(Dir.pwd)
     end
 
     it 'returns base plist output default' do
-      expect(subject.defaults[:plist_output]).to eql(Dir.pwd)
+      expect(subject.defaults['plist_output']).to eql(Dir.pwd)
     end
 
     it 'returns base settings output default' do
-      expect(subject.defaults[:settings_output]).to eql(Dir.pwd)
+      expect(subject.defaults['settings_output']).to eql(Dir.pwd)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flip_the_switch
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael England
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement