flip_the_switch 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 619f1abd162d81a6bbad84209c1cea55f2b27aa4
-  data.tar.gz: 5fe65dd5282fa538e9d7fae127bed002ad3b5b01
+  metadata.gz: 1e9b8507bbc66a9479d3fe174c8a42fba3495200
+  data.tar.gz: 01f913063a72ab9a2bd670fe7600f0d4b16fc830
 SHA512:
-  metadata.gz: a2e7f90c45df40258f8ff75ccae108e4ca54d57f382458b617453d8871eac376846172f232ab1a0a5c2d5832a3cb24d55c4bfa85bc5bb5da26082832f3981b4b
-  data.tar.gz: 6d7949f226ffec6785cadf0c6008ec653b9d0f28ec266c61db17eb92815ae79e941927dfa11cd98c9ad14eaf91f3e62c312cf7fe34cade0db96a209a7ef2391a
+  metadata.gz: 8077a424aec23a34f08139b7213c8f17d8c650d980a3cea097c1d137609f08d5af256823eacf89b9fd67af9b5fd3255a6d7cf70e9a4a6d0a8e62a34bd7256144
+  data.tar.gz: a5a65e6aa1a43e8e22a4424a76efd73a90c99106c851ff5cfb2880ee4ea71529d7a159c352b57ebcfa02e34456c439661015f0fa86ebe9599f51dd5190489ce1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.0 / 2014-07-16
+
+ * [FEATURE] #17 Use environments for feature states
+ * [FEATURE] #16 Allow reading of CLI defaults from yml file
+ * [FEATURE] #14 Auto-create Settings.bundle from feature defaults
+
 # 0.3.0 / 2014-07-02
 
  * [FEATURE] #15 Auto-create category for features

data/Example/.gitignore

@@ -1,2 +1,3 @@
 Colors-iOS/Features.plist
-Colors-iOS/FlipTheSwitch+Features.*
+Colors-iOS/FlipTheSwitch+Features.*
+Colors-iOS/Settings.bundle/

data/Example/Colors-iOS/ViewControlleriOS.m

@@ -12,12 +12,39 @@
 
 @implementation ViewControlleriOS
 
+#pragma mark - Lifecycle
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 #pragma mark - UIViewController Lifecycle
 
 - (void)viewDidLoad
 {
     [super viewDidLoad];
     [self setupView];
+    [self setupStateChangeNotifications];
+}
+
+- (void)setupStateChangeNotifications
+{
+    [self setupNotification:UIApplicationWillEnterForegroundNotification];
+    [self setupNotification:UIApplicationDidBecomeActiveNotification];
+}
+
+- (void)setupNotification:(NSString *)notification
+{
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(applicationStateChanged:)
+                                                 name:notification
+                                               object:nil];
+}
+
+- (void)applicationStateChanged:(UIApplication *)application
+{
+    [self setupView];
 }
 
 #pragma mark - Actions

data/Example/Colors.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		35D6E35AEAC9473FAAAB5BE5 /* libPods-Colors-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F7C4D132FE24A06ACC52E5F /* libPods-Colors-iOS.a */; };
+		5B13CA4919721395001D008A /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 5B13CA4819721395001D008A /* Settings.bundle */; };
 		5B20701A194237BF00D07667 /* Features.plist in Resources */ = {isa = PBXBuildFile; fileRef = F80321679CBE499FFA387688 /* Features.plist */; };
 		5B909898193A235E004C12B3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B909897193A235E004C12B3 /* Foundation.framework */; };
 		5B90989C193A235E004C12B3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B90989B193A235E004C12B3 /* UIKit.framework */; };
@@ -20,6 +21,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		5B13CA4819721395001D008A /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		5B909894193A235E004C12B3 /* Colors-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Colors-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5B909897193A235E004C12B3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		5B90989B193A235E004C12B3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -93,6 +95,7 @@
 				F803243E8A66F29C3EA37B65 /* AppDelegateiOS.m */,
 				F8032EBDB675B3B788B1297F /* FlipTheSwitch+Features.h */,
 				F803287440254AB051D00DDB /* FlipTheSwitch+Features.m */,
+				5B13CA4819721395001D008A /* Settings.bundle */,
 			);
 			path = "Colors-iOS";
 			sourceTree = "<group>";
@@ -162,6 +165,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5B13CA4919721395001D008A /* Settings.bundle in Resources */,
 				5B20701A194237BF00D07667 /* Features.plist in Resources */,
 				5B9098B3193A235E004C12B3 /* Images.xcassets in Resources */,
 				5B9098AB193A235E004C12B3 /* Main_iPhone.storyboard in Resources */,

data/Example/Rakefile

@@ -19,5 +19,6 @@ end
 task :test => podfile_lock do
   sh 'bundle exec ../bin/flip-the-switch plist -o Colors-iOS'
   sh 'bundle exec ../bin/flip-the-switch category -o Colors-iOS'
+  sh 'bundle exec ../bin/flip-the-switch settings -o Colors-iOS'
   sh "xctool build -scheme #{workspace}-iOS -workspace #{workspace}.xcworkspace -sdk iphonesimulator OBJROOT=#{build} SHARED_PRECOMPS_DIR=#{build}"
 end

data/Example/features.yml

@@ -1,2 +1,3 @@
-purple_color: Yes
-red_color: No
+default:
+  purple_color: Yes
+  red_color: No

data/FlipTheSwitch.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'FlipTheSwitch'
-  s.version = '0.3.0'
+  s.version = '0.4.0'
   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

@@ -2,7 +2,7 @@
 
 A feature switching/toggling/flipping library  for ObjectiveC.
 
-# flip_the_switch [![Build Status](https://travis-ci.org/michaelengland/FlipTheSwitch.svg?branch=master)](https://travis-ci.org/michaelengland/FlipTheSwitch) [![Code Climate](https://codeclimate.com/github/michaelengland/FlipTheSwitch.png)](https://codeclimate.com/github/michaelengland/FlipTheSwitch) [![Code Climate](https://codeclimate.com/github/michaelengland/FlipTheSwitch/coverage.png)](https://codeclimate.com/github/michaelengland/FlipTheSwitch) [![Gem Version](https://badge.fury.io/rb/flip-the-switch.svg)](http://badge.fury.io/rb/flip-the-switch)
+# flip_the_switch [![Build Status](https://travis-ci.org/michaelengland/FlipTheSwitch.svg?branch=master)](https://travis-ci.org/michaelengland/FlipTheSwitch) [![Code Climate](https://codeclimate.com/github/michaelengland/FlipTheSwitch.png)](https://codeclimate.com/github/michaelengland/FlipTheSwitch) [![Code Climate](https://codeclimate.com/github/michaelengland/FlipTheSwitch/coverage.png)](https://codeclimate.com/github/michaelengland/FlipTheSwitch) [![Gem Version](https://badge.fury.io/rb/flip_the_switch.svg)](http://badge.fury.io/rb/flip_the_switch)
 
 A gem command line tool for generating the `Features.plist` & `FlipTheSwitch+Features.{h,m}` categories to help with the corresponding Pod.
 
@@ -63,6 +63,7 @@ If you install the gem, you will be able to use the Command-Line-Interface.
 The CLI consists of 2 commands:
 
  - `plist` - creates a `Features.plist` file for enabled/disabled features like that mentioned above.
+ - `settings` - creates a `Settings.bundle` used by the OS settings. These can then be used to enable/disable the features at runtime.
  - `category` - creates `FlipTheSwitch+Features.{h,m}` files for features, thus giving compile-time checks for adding/removal of new features.
 e.g:
 
@@ -83,7 +84,16 @@ e.g:
 The features, along with their default enabled/disabled state, are read from a `features.yml` file. e.g.:
 
 ```yaml
-awesome_feature: Yes
+default:
+  awesome_feature: Yes
+```
+
+In order to avoid typing in the same options all the time, you can create a `.flip.yml` file for the default options, e.g.:
+
+```yaml
+input: features
+environment: development
+category_output: Classes/Extensions
 ```
 
 For more information, run `flip-the-switch help`
@@ -92,7 +102,7 @@ For more information, run `flip-the-switch help`
 
 Add `pod 'FlipTheSwitch'` to your Podfile
 
-Add `gem 'flip-the-switch'` to your Gemfile
+Add `gem 'flip_the_switch'` to your Gemfile
 
 ## Authors
 

data/bin/flip-the-switch

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
 require 'flip_the_switch/cli'
 
-FlipTheSwitch::Cli.start
+begin
+  FlipTheSwitch::Cli.start
+rescue FlipTheSwitch::Error::Base => e
+  $stderr.puts e
+  exit(false)
+end

data/flip_the_switch.gemspec

@@ -4,7 +4,7 @@ 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 = '0.3.0'
+  s.version = '0.4.0'
   s.license = 'MIT'
 
   s.add_dependency 'activesupport', '~> 3.2'

data/lib/flip_the_switch/cli.rb

@@ -3,22 +3,35 @@ require 'flip_the_switch'
 
 module FlipTheSwitch
   class Cli < Thor
-    class_option :input, type: :string, aliases: '-i', default: Dir.pwd, desc: 'Location of the directory containing features.yml file to read'
-    class_option :enabled, type: :array, aliases: '-e', default: [], desc: 'Extra features to be set as enabled'
-    class_option :disabled, type: :array, aliases: '-d', default: [], desc: 'Extra features to be set as disabled'
+    private
+    def self.defaults
+      @defaults ||= Reader::Defaults.new.defaults
+    end
+
+    public
+    class_option :input, type: :string, aliases: '-i', default: defaults[:input], desc: 'Location of the 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 :enabled, type: :string, aliases: '-e', default: defaults[:enabled], desc: 'Extra features to be set as enabled'
+    class_option :disabled, type: :string, aliases: '-d', default: defaults[:disabled], desc: 'Extra features to be set as disabled'
 
     desc 'plist', 'Auto-generates a Features.plist file for enabled/disabled features'
-    method_option :output, type: :string, aliases: '-o', default: Dir.pwd, desc: 'Location of the directory in which Features.plist file will be created'
+    method_option :output, type: :string, aliases: '-o', default: defaults[:plist_output], desc: 'Location of the 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: Dir.pwd, 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'
+    def settings
+      settings_generator.generate
+    end
+
     private
 
     def plist_generator
@@ -29,26 +42,30 @@ module FlipTheSwitch
       Generator::Category.new(output, feature_states)
     end
 
+    def settings_generator
+      Generator::Settings.new(output, feature_states)
+    end
+
     def output
-      options.output
+      options['output']
     end
 
     def feature_states
-      yaml_reader.feature_states.
+      feature_reader.feature_states.
           merge(enabled_states).
           merge(disabled_states)
     end
 
-    def yaml_reader
-      Reader::Yaml.new(options.input)
+    def feature_reader
+      Reader::Features.new(options['input'], options['environment'])
     end
 
     def enabled_states
-      states_for(options.enabled, true)
+      states_for(options['enabled'].split(','), true)
     end
 
     def disabled_states
-      states_for(options.disabled, false)
+      states_for(options['disabled'].split(','), false)
     end
 
     def states_for(array, default)

data/lib/flip_the_switch/errors.rb

@@ -7,6 +7,15 @@ module FlipTheSwitch
     end
 
     class InvalidFile < Base
+      def initialize(file)
+        super("Invalid file - #{file}")
+      end
+    end
+
+    class InvalidEnvironment < Base
+      def initialize(environment)
+        super("Invalid environment - #{environment}")
+      end
     end
   end
 end

data/lib/flip_the_switch/generator/category.rb

@@ -1,3 +1,4 @@
+require 'flip_the_switch/generator/base'
 require 'active_support/inflector'
 require 'erb'
 

data/lib/flip_the_switch/generator/plist.rb

@@ -1,3 +1,4 @@
+require 'flip_the_switch/generator/base'
 require 'plist'
 
 module FlipTheSwitch

data/lib/flip_the_switch/generator/settings.rb

@@ -0,0 +1,121 @@
+require 'flip_the_switch/generator/base'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'plist'
+
+module FlipTheSwitch
+  module Generator
+    class Settings < Base
+      def generate
+        create_settings_bundle_if_not_exists
+        read_settings
+        delete_existing_settings_if_exist
+        write_settings
+      end
+
+      private
+
+      def create_settings_bundle_if_not_exists
+        unless Dir.exists?(settings_bundle)
+          Dir.mkdir(settings_bundle)
+        end
+      end
+
+      def read_settings
+        current_plist
+      end
+
+      def delete_existing_settings_if_exist
+        delete_root_plist_if_exists
+        delete_features_plist_if_exists
+      end
+
+      def write_settings
+        write_root_plist
+        write_features_plist
+      end
+
+      def delete_root_plist_if_exists
+        delete_file(root_plist)
+      end
+
+      def delete_features_plist_if_exists
+        delete_file(features_plist)
+      end
+
+      def write_root_plist
+        ::Plist::Emit.save_plist(root, root_plist)
+      end
+
+      def write_features_plist
+        ::Plist::Emit.save_plist(features, features_plist)
+      end
+
+      def delete_file(file)
+        File.delete(file) if File.exists?(file)
+      end
+
+      def root
+        current_plist.with_indifferent_access.merge(PreferenceSpecifiers: root_preferences)
+      end
+
+      def root_preferences
+        existing_root_preferences.delete_if { |root_preference|
+          root_preference[:Title] == 'Features'
+        } + feature_root_preferences
+      end
+
+      def existing_root_preferences
+        current_plist.with_indifferent_access[:PreferenceSpecifiers] || []
+      end
+
+      def feature_root_preferences
+        [
+            {
+                Title: 'Features',
+                Type: 'PSGroupSpecifier'
+            },
+            {
+                File: 'Features',
+                Title: 'Features',
+                Type: 'PSChildPaneSpecifier'
+            }
+        ]
+      end
+
+      def features
+        {PreferenceSpecifiers: feature_toggles}
+      end
+
+      def feature_toggles
+        feature_states.map { |feature, state|
+          {
+              Type: 'PSToggleSwitchSpecifier',
+              Title: feature,
+              Key: "FTS_FEATURE_#{feature}",
+              DefaultValue: state
+          }
+        }
+      end
+
+      def current_plist
+        @current_plist ||= if File.exists?(root_plist)
+                             ::Plist::parse_xml(root_plist)
+                           else
+                             {}
+                           end
+      end
+
+      def root_plist
+        File.join(settings_bundle, 'Root.plist')
+      end
+
+      def features_plist
+        File.join(settings_bundle, 'Features.plist')
+      end
+
+      def settings_bundle
+        File.join(output, 'Settings.bundle')
+      end
+    end
+  end
+end

data/lib/flip_the_switch/generator.rb

@@ -1,3 +1,3 @@
-require 'flip_the_switch/generator/base'
 require 'flip_the_switch/generator/category'
 require 'flip_the_switch/generator/plist'
+require 'flip_the_switch/generator/settings'

data/lib/flip_the_switch/reader/defaults.rb

@@ -0,0 +1,43 @@
+require 'active_support/core_ext/hash/indifferent_access'
+
+module FlipTheSwitch
+  module Reader
+    class Defaults
+      def defaults
+        if valid_file?
+          base_defaults.merge(file_defaults)
+        else
+          raise Error::InvalidFile.new(defaults_file)
+        end
+      end
+
+      private
+
+      def valid_file?
+        file_defaults.is_a?(Hash)
+      end
+
+      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
+      end
+
+      def file_defaults
+        @file_defaults ||= YAML.load_file(defaults_file)
+      rescue SystemCallError
+        {}
+      end
+
+      def defaults_file
+        '.flip.yml'
+      end
+    end
+  end
+end

data/lib/flip_the_switch/reader/features.rb

@@ -0,0 +1,53 @@
+require 'yaml'
+
+module FlipTheSwitch
+  module Reader
+    class Features
+      def initialize(input, environment)
+        @input = input
+        @environment = environment
+      end
+
+      def feature_states
+        if valid_file?
+          environment_states
+        else
+          raise Error::InvalidFile.new(input_file)
+        end
+      end
+
+      private
+      attr_reader :input, :environment
+
+      def valid_file?
+        file_states.is_a?(Hash) && file_states.all? { |environment, feature|
+          environment.is_a?(String) && valid_feature_hash?(feature)
+        }
+      end
+
+      def valid_feature_hash?(feature_hash)
+        feature_hash.is_a?(Hash) && feature_hash.all? { |feature, state|
+          feature.is_a?(String) && !!state == state
+        }
+      end
+
+      def environment_states
+        if file_states.has_key?(environment)
+          file_states[environment]
+        else
+          raise Error::InvalidEnvironment.new(environment)
+        end
+      end
+
+      def file_states
+        @file_states ||= YAML.load_file(input_file)
+      rescue SystemCallError => e
+        raise Error::UnreadableFile.new(e)
+      end
+
+      def input_file
+        File.join(input, 'features.yml')
+      end
+    end
+  end
+end

data/lib/flip_the_switch/reader.rb

@@ -1 +1,2 @@
-require 'flip_the_switch/reader/yaml'
+require 'flip_the_switch/reader/features'
+require 'flip_the_switch/reader/defaults'

data/spec/flip_the_switch/cli_spec.rb

@@ -16,14 +16,14 @@ describe FlipTheSwitch::Cli do
   end
 
   shared_examples_for 'generator' do
-    let(:yaml_reader) { double(FlipTheSwitch::Reader::Yaml, feature_states: {'something' => true}) }
+    let(:feature_reader) { double(FlipTheSwitch::Reader::Features, feature_states: {'something' => true}) }
     let(:generator) { double(generator_class) }
 
     context 'when no options given' do
       let(:options) { [] }
 
       before do
-        FlipTheSwitch::Reader::Yaml.stub(:new).with(Dir.pwd).and_return(yaml_reader)
+        FlipTheSwitch::Reader::Features.stub(:new).with(Dir.pwd, 'default').and_return(feature_reader)
         generator_class.stub(:new).with(Dir.pwd, 'something' => true).and_return(generator)
       end
 
@@ -35,7 +35,7 @@ describe FlipTheSwitch::Cli do
 
     context 'when options given' do
       before do
-        FlipTheSwitch::Reader::Yaml.stub(:new).with('input').and_return(yaml_reader)
+        FlipTheSwitch::Reader::Features.stub(:new).with('input', 'environment').and_return(feature_reader)
         generator_class.stub(:new).with('output', {
             'something' => true,
             'en' => true,
@@ -46,7 +46,7 @@ describe FlipTheSwitch::Cli do
       end
 
       context 'using full name' do
-        let(:options) { %w(--input=input --output=output --enabled=en abled --disabled=dis appointing) }
+        let(:options) { %w(--input=input --environment=environment --output=output --enabled=en,abled --disabled=dis,appointing) }
 
         it 'generates using the options given' do
           expect(generator).to receive(:generate)
@@ -55,7 +55,7 @@ describe FlipTheSwitch::Cli do
       end
 
       context 'using aliases' do
-        let(:options) { %w(-i=input -o=output -e=en abled -d=dis appointing) }
+        let(:options) { %w(-i=input -n=environment -o=output -e=en,abled -d=dis,appointing) }
 
         it 'generates using the options given' do
           expect(generator).to receive(:generate)
@@ -78,4 +78,11 @@ describe FlipTheSwitch::Cli do
 
     it_behaves_like 'generator'
   end
+
+  context 'when settings command called' do
+    let(:command) { 'settings' }
+    let(:generator_class) { FlipTheSwitch::Generator::Settings }
+
+    it_behaves_like 'generator'
+  end
 end

data/spec/flip_the_switch/generator/category_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe FlipTheSwitch::Generator::Category do
-  subject(:category) { FlipTheSwitch::Generator::Category.new(output, feature_states) }
+  subject(:category) { described_class.new(output, feature_states) }
   let(:output) { 'spec/resources' }
   let(:feature_states) { {'first_feature' => true, 'second_feature' => false} }
   let(:expected_header_file) { File.read('spec/resources/expected_header.h') }

data/spec/flip_the_switch/generator/plist_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe FlipTheSwitch::Generator::Plist do
-  subject(:plist) { FlipTheSwitch::Generator::Plist.new(output, feature_states) }
+  subject(:plist) { described_class.new(output, feature_states) }
   let(:output) { 'spec/resources' }
   let(:feature_states) { {enabled_feature: true, disabled_feature: false} }
   let(:output_file) { 'spec/resources/Features.plist' }

data/spec/flip_the_switch/generator/settings_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+require 'fileutils'
+
+describe FlipTheSwitch::Generator::Settings do
+  subject(:settings) { described_class.new(output, feature_states) }
+  let(:output) { 'spec/resources' }
+  let(:settings_bundle) { File.join(output, 'Settings.bundle') }
+  let(:feature_states) { {'first_feature' => true, 'second_feature' => false} }
+  let(:root_output_file) { File.read(File.join(settings_bundle, 'Root.plist')) }
+  let(:features_output_file) { File.read(File.join(settings_bundle, 'Features.plist')) }
+  let(:features_output_file) { File.read(File.join(settings_bundle, 'Features.plist')) }
+  let(:expected_features_file) { File.read('spec/resources/ExpectedSettingsFeatures.plist')}
+
+  after do
+    delete_settings_bundle_if_exists
+  end
+
+  context 'when settings already exist' do
+    let(:expected_root_file) { File.read('spec/resources/ExpectedSettingsMergeExistingRoot.plist') }
+
+    before do
+      Dir.mkdir(settings_bundle)
+      File.write(File.join(settings_bundle, 'Root.plist'), File.read('spec/resources/ExistingSettingsRoot.plist'))
+    end
+
+    it 'adds child page link to existing settings' do
+      subject.generate
+
+      expect(root_output_file).to eql(expected_root_file)
+    end
+
+    it 'creates a features settings page' do
+      subject.generate
+
+      expect(features_output_file).to eql(expected_features_file)
+    end
+  end
+
+  context 'when settings already exist and have already got features' do
+    let(:expected_root_file) { File.read('spec/resources/ExpectedSettingsMergeExistingRoot.plist') }
+
+    before do
+      Dir.mkdir(settings_bundle)
+      File.write(File.join(settings_bundle, 'Root.plist'), File.read('spec/resources/ExpectedSettingsMergeExistingRoot.plist'))
+      File.write(File.join(settings_bundle, 'Features.plist'), File.read('spec/resources/ExpectedFeatures.plist'))
+    end
+
+    it 'creates settings with features child page link' do
+      subject.generate
+
+      expect(root_output_file).to eql(expected_root_file)
+    end
+
+    it 'creates a features settings page' do
+      subject.generate
+
+      expect(features_output_file).to eql(expected_features_file)
+    end
+  end
+
+  context 'when no settings already exist' do
+    let(:expected_root_file) { File.read('spec/resources/ExpectedSettingsBaseRoot.plist') }
+
+    it 'creates settings with features child page link' do
+      subject.generate
+
+      expect(root_output_file).to eql(expected_root_file)
+    end
+
+    it 'creates a features settings page' do
+      subject.generate
+
+      expect(features_output_file).to eql(expected_features_file)
+    end
+  end
+
+  def delete_settings_bundle_if_exists
+    FileUtils.rm_rf(settings_bundle) if Dir.exists?(settings_bundle)
+  end
+end

data/spec/flip_the_switch/reader/defaults_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+describe FlipTheSwitch::Reader::Defaults do
+  subject(:reader) { described_class.new }
+  let(:defaults_file) { '.flip.yml' }
+
+  after do
+    File.delete(defaults_file) if File.exists?(defaults_file)
+  end
+
+  context 'when defaults file exists' do
+    context 'when valid' do
+      before do
+        File.write(defaults_file, YAML.dump({
+            input: 'input',
+            environment: 'environment',
+            enabled: 'enabled',
+            disabled: 'disabled',
+            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')
+      end
+
+      it 'returns file environment default' do
+        expect(subject.defaults[:environment]).to eql('environment')
+      end
+
+      it 'returns file enabled default' do
+        expect(subject.defaults[:enabled]).to eql('enabled')
+      end
+
+      it 'returns file disabled default' do
+        expect(subject.defaults[:disabled]).to eql('disabled')
+      end
+
+      it 'returns file category output default' do
+        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')
+      end
+
+      it 'returns file settings output default' do
+        expect(subject.defaults[:settings_output]).to eql('settings_output')
+      end
+    end
+
+    context 'when invalid' do
+      before do
+        File.write(defaults_file, 'this is not what we want')
+      end
+
+      specify do
+        expect {
+          subject.defaults
+        }.to raise_error(FlipTheSwitch::Error::InvalidFile)
+      end
+    end
+  end
+
+  context 'when defaults file does NOT exist' do
+    it 'returns base input default' do
+      expect(subject.defaults[:input]).to eql(Dir.pwd)
+    end
+
+    it 'returns base environment default' do
+      expect(subject.defaults[:environment]).to eql('default')
+    end
+
+    it 'returns base enabled default' do
+      expect(subject.defaults[:enabled]).to eql('')
+    end
+
+    it 'returns base disabled default' do
+      expect(subject.defaults[:disabled]).to eql('')
+    end
+
+    it 'returns base category output default' do
+      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)
+    end
+
+    it 'returns base settings output default' do
+      expect(subject.defaults[:settings_output]).to eql(Dir.pwd)
+    end
+  end
+end

data/spec/flip_the_switch/reader/{yaml_spec.rb → features_spec.rb}

@@ -1,13 +1,26 @@
 require 'spec_helper'
 
-describe FlipTheSwitch::Reader::Yaml do
-  subject(:reader) { described_class.new(input) }
+describe FlipTheSwitch::Reader::Features do
+  subject(:reader) { described_class.new(input, environment) }
+  let(:environment) { 'beta' }
 
   context 'when given a real file' do
     let(:input) { 'spec/resources/real' }
 
-    it 'reads the enabled/disabled states of the features' do
-      expect(subject.feature_states).to eql('enabled_feature' => true, 'disabled_feature' => false)
+    context 'when given an valid environment' do
+      it 'reads the enabled/disabled states of the features for the environment' do
+        expect(subject.feature_states).to eql('enabled_feature' => true, 'disabled_feature' => false)
+      end
+    end
+
+    context 'when given an invalid environment' do
+      let(:environment) { 'invalid' }
+
+      specify do
+        expect {
+          subject.feature_states
+        }.to raise_error(FlipTheSwitch::Error::InvalidEnvironment)
+      end
     end
   end
 

data/spec/resources/ExistingSettingsRoot.plist

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>Type</key>
+			<string>PSSliderSpecifier</string>
+			<key>Key</key>
+			<string>SomeThing</string>
+			<key>DefaultValue</key>
+			<integer>0</integer>
+			<key>MinimumValue</key>
+			<integer>0</integer>
+			<key>MaximumValue</key>
+			<integer>0</integer>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>On/Off</string>
+			<key>Key</key>
+			<string>whatever</string>
+			<key>DefaultValue</key>
+			<false/>
+		</dict>
+	</array>
+	<key>StringsTable</key>
+	<string>Root</string>
+</dict>
+</plist>

data/spec/resources/ExpectedSettingsBaseRoot.plist

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>Title</key>
+			<string>Features</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>File</key>
+			<string>Features</string>
+			<key>Title</key>
+			<string>Features</string>
+			<key>Type</key>
+			<string>PSChildPaneSpecifier</string>
+		</dict>
+	</array>
+</dict>
+</plist>

data/spec/resources/ExpectedSettingsFeatures.plist

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>DefaultValue</key>
+			<true/>
+			<key>Key</key>
+			<string>FTS_FEATURE_first_feature</string>
+			<key>Title</key>
+			<string>first_feature</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>FTS_FEATURE_second_feature</string>
+			<key>Title</key>
+			<string>second_feature</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+	</array>
+</dict>
+</plist>

data/spec/resources/ExpectedSettingsMergeExistingRoot.plist

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>DefaultValue</key>
+			<integer>0</integer>
+			<key>Key</key>
+			<string>SomeThing</string>
+			<key>MaximumValue</key>
+			<integer>0</integer>
+			<key>MinimumValue</key>
+			<integer>0</integer>
+			<key>Type</key>
+			<string>PSSliderSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>whatever</string>
+			<key>Title</key>
+			<string>On/Off</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>Title</key>
+			<string>Features</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>File</key>
+			<string>Features</string>
+			<key>Title</key>
+			<string>Features</string>
+			<key>Type</key>
+			<string>PSChildPaneSpecifier</string>
+		</dict>
+	</array>
+	<key>StringsTable</key>
+	<string>Root</string>
+</dict>
+</plist>

data/spec/resources/real/features.yml

@@ -1,2 +1,6 @@
-enabled_feature: Yes
-disabled_feature: No
+defaults: &DEFAULT
+  enabled_feature: Yes
+  disabled_feature: Yes
+beta:
+  <<: *DEFAULT
+  disabled_feature: No

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flip_the_switch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael England
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -115,13 +115,21 @@ files:
 - lib/flip_the_switch/generator/header.h.erb
 - lib/flip_the_switch/generator/implementation.m.erb
 - lib/flip_the_switch/generator/plist.rb
+- lib/flip_the_switch/generator/settings.rb
 - lib/flip_the_switch/reader.rb
-- lib/flip_the_switch/reader/yaml.rb
+- lib/flip_the_switch/reader/defaults.rb
+- lib/flip_the_switch/reader/features.rb
 - spec/flip_the_switch/cli_spec.rb
 - spec/flip_the_switch/generator/category_spec.rb
 - spec/flip_the_switch/generator/plist_spec.rb
-- spec/flip_the_switch/reader/yaml_spec.rb
+- spec/flip_the_switch/generator/settings_spec.rb
+- spec/flip_the_switch/reader/defaults_spec.rb
+- spec/flip_the_switch/reader/features_spec.rb
+- spec/resources/ExistingSettingsRoot.plist
 - spec/resources/ExpectedFeatures.plist
+- spec/resources/ExpectedSettingsBaseRoot.plist
+- spec/resources/ExpectedSettingsFeatures.plist
+- spec/resources/ExpectedSettingsMergeExistingRoot.plist
 - spec/resources/expected_header.h
 - spec/resources/expected_implementation.m
 - spec/resources/invalid_layout/features.yml
@@ -148,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A simple library to help enabling/disabling features on iOS/Mac applications.
@@ -156,8 +164,14 @@ test_files:
 - spec/flip_the_switch/cli_spec.rb
 - spec/flip_the_switch/generator/category_spec.rb
 - spec/flip_the_switch/generator/plist_spec.rb
-- spec/flip_the_switch/reader/yaml_spec.rb
+- spec/flip_the_switch/generator/settings_spec.rb
+- spec/flip_the_switch/reader/defaults_spec.rb
+- spec/flip_the_switch/reader/features_spec.rb
+- spec/resources/ExistingSettingsRoot.plist
 - spec/resources/ExpectedFeatures.plist
+- spec/resources/ExpectedSettingsBaseRoot.plist
+- spec/resources/ExpectedSettingsFeatures.plist
+- spec/resources/ExpectedSettingsMergeExistingRoot.plist
 - spec/resources/expected_header.h
 - spec/resources/expected_implementation.m
 - spec/resources/invalid_layout/features.yml

data/lib/flip_the_switch/reader/yaml.rb

@@ -1,39 +0,0 @@
-require 'yaml'
-
-module FlipTheSwitch
-  module Reader
-    class Yaml
-      def initialize(input)
-        @input = input
-      end
-
-      def feature_states
-        if valid_file?
-          file_states
-        else
-          raise Error::InvalidFile.new
-        end
-      end
-
-      private
-      attr_reader :input
-
-      def valid_file?
-        file_states.is_a?(Hash) && file_states.all? { |feature, state|
-          feature.is_a?(String) && !!state == state
-        }
-      end
-
-      def file_states
-        @file_states ||= YAML.load_file(input_file)
-      rescue SystemCallError => e
-        raise Error::UnreadableFile.new(e)
-      end
-
-      def input_file
-        File.join(input, 'features.yml')
-      end
-    end
-  end
-end
-