localeapp 0.6.7 → 0.6.8

data/bin/localeapp

@@ -24,6 +24,16 @@ else
 end
 
 pre do |global_options, command, options, args|
+  global_options[:k] = if global_options[:k]
+    global_options[:k]
+  elsif ENV['LOCALEAPP_API_KEY']
+    ENV['LOCALEAPP_API_KEY']
+  elsif File.exist?('.env') && IO.read('.env') =~ /^LOCALEAPP_API_KEY=(\w+)$/
+    $1
+  else
+    nil
+  end
+
   if Localeapp.has_config_file? || !global_options[:k].nil?
     true
   else
@@ -43,7 +53,10 @@ arg_name "<api_key>"
 command :install do |c|
   c.desc "install configuration files in .localeapp/"
   c.switch [:s, 'standalone']
-  
+
+  c.desc "create configuration when using localeapp via a heroku addon (PRE ALPHA)"
+  c.switch [:h, 'heroku']
+
   c.desc "install a skeleton project suitable for Github"
   c.switch [:g, 'github']
 
@@ -51,6 +64,7 @@ command :install do |c|
     key = args.first
     installer = Localeapp::CLI::Install.new
     installer.config_type = :standalone if options[:standalone]
+    installer.config_type = :heroku if options[:heroku]
     installer.config_type = :github if options[:github]
     installer.config_type ||= :rails
     unless installer.execute(key)

data/features/add.feature

@@ -44,3 +44,30 @@ Feature: Adding a translation from the command line
     Sending key: foo.baz
     Success!
     """
+
+  Scenario: Running add with no initializer file, passing the key via an ENV variable
+    In order to add a key and translation content
+    When I have a valid project on localeapp.com with api key "MYAPIKEY"
+    When I have a LOCALEAPP_API_KEY env variable set to "MYAPIKEY"
+    When I run `localeapp add foo.baz en:"test en content"`
+    Then the output should contain:
+    """
+    Localeapp Add
+
+    Sending key: foo.baz
+    Success!
+    """
+    Then I clear the LOCALEAPP_API_KEY env variable
+
+  Scenario: Running add with no initializer file, passing the key via a .env file
+    In order to add a key and translation content
+    When I have a valid project on localeapp.com with api key "MYAPIKEY"
+    When I have a .env file containing the api key "MYAPIKEY"
+    When I run `localeapp add foo.baz en:"test en content"`
+    Then the output should contain:
+    """
+    Localeapp Add
+
+    Sending key: foo.baz
+    Success!
+    """

data/features/install.feature

@@ -28,7 +28,9 @@ Feature: Installation
     Checking API key: MYAPIKEY
     Success!
     Project: Test Project
-    Default Locale: en (English)
+    NOTICE: you probably want to add .localeapp to your .gitignore file
+    Writing configuration file to .localeapp/config.rb
+    WARNING: please create the locales directory. Your translation data will be stored there.
     """
     And help should not be displayed
     And a file named ".localeapp/config.rb" should exist
@@ -45,7 +47,8 @@ Feature: Installation
     Checking API key: MYAPIKEY
     Success!
     Project: Test Project
-    Default Locale: en (English)
+    NOTICE: you probably want to add .localeapp to your .gitignore file
+    Writing configuration file to .localeapp/config.rb
     """
     And help should not be displayed
     And a file named ".localeapp/config.rb" should exist
@@ -53,6 +56,27 @@ Feature: Installation
     And a file named "README.md" should exist
     And the exit status should be 0
 
+  Scenario: Running heroku install with no api key
+    In order to configure my project to use localeapp as a heroku addon
+    When I have a valid heroku project
+    And I run `localeapp install --heroku`
+    Then the output should contain:
+    """
+    Localeapp Install
+
+    Getting API key from heroku config
+    Add the following line to your .env file for Foreman
+    LOCALEAPP_API_KEY=MYAPIKEY
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    Checking API key: MYAPIKEY
+    Success!
+    Project: Test Project
+    Default Locale: en (English)
+    """
+    And help should not be displayed
+    And a file named "config/initializers/localeapp.rb" should exist
+    And the file "config/initializers/localeapp.rb" should contain "config.api_key = ENV['LOCALEAPP_API_KEY']"
+    And the exit status should be 0
 
   Scenario: Running install with bad api key
     In order to configure my project and check my api key is correct

data/features/step_definitions/cli_steps.rb

@@ -9,6 +9,13 @@ When /^I have a valid project on localeapp\.com with api key "([^"]*)"$/ do |api
   add_fake_web_uri(:post, "https://api.localeapp.com/v1/projects/#{api_key}/translations/missing.json", ["202", "OK"], '')
 end
 
+When /^I have a valid heroku project/ do
+  uri = "https://api.localeapp.com/v1/projects/MYAPIKEY.json"
+  body = valid_project_data.to_json
+  add_fake_web_uri(:get, uri, ['200', 'OK'], body)
+  ENV['CUCUMBER_HEROKU_TEST_API_KEY'] = 'MYAPIKEY'
+end
+
 When /^I have a valid project on localeapp\.com but an incorrect api key "([^"]*)"$/ do |bad_api_key|
   uri = "https://api.localeapp.com/v1/projects/#{bad_api_key}.json"
   body = valid_project_data.to_json
@@ -34,6 +41,23 @@ When /^I have a valid project on localeapp\.com with api key "([^"]*)" and the t
   add_fake_web_uri(:post, uri + '/rename', ['200', 'OK'], '')
 end
 
+When /^I have a LOCALEAPP_API_KEY env variable set to "(.*?)"$/ do |api_key|
+  ENV['LOCALEAPP_API_KEY'] = api_key
+end
+
+Then /^I clear the LOCALEAPP_API_KEY env variable$/ do
+  ENV['LOCALEAPP_API_KEY'] = nil
+end
+
+When /^I have a \.env file containing the api key "(.*?)"$/ do |api_key|
+  steps %Q{
+    And a file named ".env" with:
+    """
+    LOCALEAPP_API_KEY=#{api_key}
+    """
+  }
+end
+
 When /^an initializer file$/ do
   steps %Q{
     And a file named "config/initializers/localeapp.rb" with:

data/lib/localeapp/cli/install.rb

@@ -5,70 +5,228 @@ module Localeapp
 
       def initialize(args = {})
         super
-        @config_type = :rails
+        @config_type = :default
       end
 
-      def execute(key)
-        @output.puts "Localeapp Install"
-        @output.puts ""
-        @output.puts "Checking API key: #{key}"
-        if key.nil?
-          @output.puts "ERROR: You must supply an API key"
-          return
-        end
-        valid_key, project_data = check_key(key)
-        if valid_key
-          @output.puts "Success!"
-          @output.puts "Project: #{project_data['name']}"
-          localeapp_default_code = project_data['default_locale']['code']
-          @output.puts "Default Locale: #{localeapp_default_code} (#{project_data['default_locale']['name']})"
+      def execute(key = nil)
+        installer("#{config_type.to_s.capitalize}Installer").execute(key)
+      end
+
+      def installer(installer_class)
+        self.class.const_get(installer_class).new(@output)
+      end
 
-          if config_type == :rails
-            if I18n.default_locale.to_s != localeapp_default_code
-              @output.puts "WARNING: I18n.default_locale is #{I18n.default_locale}, change in config/environment.rb (Rails 2) or config/application.rb (Rails 3)"
-            end
-            config_file_path = "config/initializers/localeapp.rb"
-            data_directory   = "config/locales"
+      class DefaultInstaller
+        attr_accessor :key, :project_data, :config_file_path, :data_directory
+
+        def initialize(output)
+          @output = output
+        end
+
+        def execute(key = nil)
+          self.key = key
+          print_header
+          if validate_key
+            check_default_locale
+            set_config_paths
+            @output.puts "Writing configuration file to #{config_file_path}"
+            write_config_file
+            check_data_directory_exists
+            true
           else
-            if config_type == :standalone
-              @output.puts "NOTICE: you probably want to add .localeapp to your .gitignore file"
-            end
-            config_file_path = ".localeapp/config.rb"
-            data_directory   = "locales"
+            false
+          end
+        end
+
+        def print_header
+          @output.puts "Localeapp Install"
+          @output.puts ""
+        end
+
+        def validate_key
+          @output.puts "Checking API key: #{key}"
+          if key.nil?
+            @output.puts "ERROR: You must supply an API key"
+            return false
           end
 
-          @output.puts "Writing configuration file to #{config_file_path}"
-          if config_type == :github
-            write_github_configuration_file config_file_path, project_data
+          valid_key, @project_data = check_key(key)
+          if valid_key
+            @output.puts "Success!"
+            @output.puts "Project: #{project_data['name']}"
+            true
           else
-            write_configuration_file config_file_path
+            @output.puts "ERROR: Project not found"
+            false
           end
+        end
 
+        def check_default_locale
+          localeapp_default_code = project_data['default_locale']['code']
+          @output.puts "Default Locale: #{localeapp_default_code} (#{project_data['default_locale']['name']})"
+          if I18n.default_locale.to_s != localeapp_default_code
+            @output.puts "WARNING: I18n.default_locale is #{I18n.default_locale}, change in config/environment.rb (Rails 2) or config/application.rb (Rails 3)"
+          end
+        end
+
+        def set_config_paths
+          @config_file_path = "config/initializers/localeapp.rb"
+          @data_directory   = "config/locales"
+        end
+
+        def write_config_file
+          create_config_dir
+          write_rails_config
+        end
+
+        def write_rails_config
+          File.open(config_file_path, 'w+') do |file|
+            file.write <<-CONTENT
+require 'localeapp/rails'
+
+Localeapp.configure do |config|
+  config.api_key = '#{key}'
+end
+CONTENT
+          end
+        end
+
+        def check_data_directory_exists
           unless File.directory?(data_directory)
             @output.puts "WARNING: please create the #{data_directory} directory. Your translation data will be stored there."
           end
-          true
-        else
-          @output.puts "ERROR: Project not found"
-          false
+        end
+
+        def check_key(key)
+          Localeapp::KeyChecker.new.check(key)
+        end
+
+        private
+        def config_dir
+          File.dirname(config_file_path)
+        end
+
+        def create_config_dir
+          FileUtils.mkdir_p(config_dir)
         end
       end
 
-      private
-      def check_key(key)
-        Localeapp::KeyChecker.new.check(key)
+      class HerokuInstaller < DefaultInstaller
+        def validate_key
+          @output.puts "Getting API key from heroku config"
+          get_heroku_api_key
+          if key.nil?
+            @output.puts "ERROR: No api key found in heroku config, have you installed the localeapp addon?"
+            return
+          else
+            @output.puts "Add the following line to your .env file for Foreman"
+            @output.puts "LOCALEAPP_API_KEY=#{key}"
+            @output.puts '^' * 80
+          end
+          super
+        end
+
+        def get_heroku_api_key
+          self.key = if ENV['CUCUMBER_HEROKU_TEST_API_KEY']
+            ENV['CUCUMBER_HEROKU_TEST_API_KEY']
+          elsif ENV['LOCALEAPP_API_KEY']
+            ENV['LOCALEAPP_API_KEY']
+          elsif File.exist?('.env') && IO.read('.env') =~ /^LOCALEAPP_API_KEY=(\w+)$/
+            $1
+          else
+            nil
+          end
+        end
+
+        def write_rails_config
+          File.open(config_file_path, 'w+') do |file|
+            file.write <<-CONTENT
+require 'localeapp/rails'
+
+Localeapp.configure do |config|
+  config.api_key = ENV['LOCALEAPP_API_KEY']
+  config.poll_interval = 300 if defined?(Rails) && Rails.env.staging?
+  config.polling_environments = [:development, :staging]
+  config.reloading_environments = [:development, :staging]
+  config.sending_environments = [:development, :staging]
+end
+
+# Pull latest when dyno restarts on staging
+if defined?(Rails) && Rails.env.staging?
+  Localeapp::CLI::Pull.new.execute
+end
+CONTENT
+          end
+        end
       end
 
-      def write_configuration_file(path)
-        if config_type == :rails
-          Localeapp.configuration.write_rails_configuration(path)
-        else
-          Localeapp.configuration.write_standalone_configuration(path)
+      class StandaloneInstaller < DefaultInstaller
+        def check_default_locale
+          # do nothing standalone
+        end
+
+        def set_config_paths
+          @output.puts "NOTICE: you probably want to add .localeapp to your .gitignore file"
+          @config_file_path = ".localeapp/config.rb"
+          @data_directory   = "locales"
+        end
+
+        def write_config_file
+          create_config_dir
+          write_standalone_config
+        end
+
+        private
+        def write_standalone_config
+          File.open(config_file_path, 'w+') do |file|
+            file.write <<-CONTENT
+Localeapp.configure do |config|
+  config.api_key                    = '#{key}'
+  config.translation_data_directory = '#{data_directory}'
+  config.synchronization_data_file  = '#{config_dir}/log.yml'
+  config.daemon_pid_file            = '#{config_dir}/localeapp.pid'
+end
+CONTENT
+          end
         end
       end
 
-      def write_github_configuration_file(path, project_data)
-          Localeapp.configuration.write_github_configuration(path, project_data)
+      class GithubInstaller < StandaloneInstaller
+        def write_config_file
+          super
+          create_data_directory
+          create_gitignore
+          create_readme
+        end
+
+        private
+        def create_data_directory
+          FileUtils.mkdir_p(data_directory)
+        end
+
+        def create_gitignore
+          File.open('.gitignore', 'a+') do |file|
+            file.write config_dir
+          end
+        end
+
+        def create_readme
+          File.open('README.md', 'w+') do |file|
+            file.write <<-CONTENT
+# #{project_data['name']}
+
+A ruby translation project managed on [Locale](http://www.localeapp.com/) that's open to all!
+
+## Contributing to #{project_data['name']}
+
+- Edit the translations directly on the [#{project_data['name']}](http://www.localeapp.com/projects/public?search=#{project_data['name']}) project on Locale.
+- **That's it!**
+- The maintainer will then pull translations from the Locale project and push to Github.
+
+Happy translating!
+CONTENT
+          end
+        end
       end
     end
   end

data/lib/localeapp/configuration.rb

@@ -109,58 +109,5 @@ module Localeapp
     def sending_disabled?
       !sending_environments.map { |v| v.to_s }.include?(environment_name)
     end
-
-    def write_rails_configuration(path)
-      dir = File.dirname(path)
-      FileUtils.mkdir_p(dir)
-      File.open(path, 'w+') do |file|
-        file.write <<-CONTENT
-require 'localeapp/rails'
-
-Localeapp.configure do |config|
-  config.api_key = '#{@api_key}'
-end
-CONTENT
-      end
-    end
-
-    def write_standalone_configuration(path)
-      dir = File.dirname(path)
-      FileUtils.mkdir_p(dir)
-      File.open(path, 'w+') do |file|
-        file.write <<-CONTENT
-Localeapp.configure do |config|
-  config.api_key                    = '#{@api_key}'
-  config.translation_data_directory = 'locales'
-  config.synchronization_data_file  = '.localeapp/log.yml'
-  config.daemon_pid_file            = '.localeapp/localeapp.pid'
-end
-CONTENT
-      end
-    end
-
-    def write_github_configuration(path, project_data)
-      write_standalone_configuration(path)
-      FileUtils.mkdir_p('locales')
-      File.open('.gitignore', 'a+') do |file|
-        file.write ".localeapp"
-      end
-      File.open('README.md', 'w+') do |file|
-        file.write <<-CONTENT
-# #{project_data['name']}
-
-A ruby translation project managed on [Locale](http://www.localeapp.com/) that's open to all!
-
-## Contributing to #{project_data['name']}
-
-- Edit the translations directly on the [#{project_data['name']}](http://www.localeapp.com/projects/public?search=#{project_data['name']}) project on Locale.
-- **That's it!**
-- The maintainer will then pull translations from the Locale project and push to Github.
-
-Happy translating!
-CONTENT
-      end
-    end
-
   end
 end

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

data/spec/localeapp/cli/install_spec.rb

@@ -1,71 +1,314 @@
 require 'spec_helper'
 require 'localeapp/cli/install'
 
-describe Localeapp::CLI::Install, '.execute(key, output = $stdout)' do
-  before(:each) do
-    @output = StringIO.new
-    @command = Localeapp::CLI::Install.new(:output => @output)
+describe Localeapp::CLI::Install, '.execute(key = nil)' do
+  let(:output) { StringIO.new }
+  let(:key) { 'MYAPIKEY' }
+  let(:command) { Localeapp::CLI::Install.new(:output => output) }
+
+  it "creates the installer based on the config type" do
+    command.config_type = :heroku
+    command.should_receive(:installer).with("HerokuInstaller").and_return(stub.as_null_object)
+    command.execute(key)
+  end
+
+  it "executes the installer with the given key" do
+    installer = stub(:installer)
+    installer.should_receive(:execute).with(key)
+    command.stub!(:installer).and_return(installer)
+    command.execute(key)
+  end
+end
+
+describe Localeapp::CLI::Install::DefaultInstaller, '#execute(key = nil)' do
+  let(:output) { StringIO.new }
+  let(:key) { 'MYAPIKEY' }
+  let(:installer) { Localeapp::CLI::Install::DefaultInstaller.new(output) }
+
+  before do
+    installer.stub!(:print_header)
+    installer.stub!(:validate_key).and_return(false)
+  end
+
+  it "prints the header" do
+    installer.should_receive(:print_header)
+    installer.execute
+  end
+
+  it "validates the key" do
+    installer.should_receive(:key=).with(key)
+    installer.should_receive(:validate_key)
+    installer.execute(key)
+  end
+
+  context "When key validation fails" do
+    it "returns false" do
+      installer.execute(key).should == false
+    end
+  end
+
+  context "When key validation is successful" do
+    before do
+      installer.stub!(:validate_key).and_return(true)
+      installer.stub!(:check_default_locale)
+      installer.stub!(:set_config_paths)
+      installer.stub!(:write_config_file)
+      installer.stub!(:check_data_directory_exists)
+    end
+
+    it "checks the default locale" do
+      installer.should_receive(:check_default_locale)
+      installer.execute(key)
+    end
+
+    it "sets the configuration paths" do
+      installer.should_receive(:set_config_paths)
+      installer.execute(key)
+    end
+
+    it "writes the configuration file" do
+      installer.should_receive(:write_config_file)
+      installer.execute(key)
+    end
+
+    it "checks the data directory exists" do
+      installer.should_receive(:check_data_directory_exists)
+      installer.execute(key)
+    end
+
+    it "returns true" do
+      installer.execute(key).should == true
+    end
+  end
+end
+
+describe Localeapp::CLI::Install::DefaultInstaller, '#validate_key(key)' do
+  let(:output) { StringIO.new }
+  let(:key) { 'MYAPIKEY' }
+  let(:installer) { Localeapp::CLI::Install::DefaultInstaller.new(output) }
+
+  before do
+    installer.key = key
   end
 
   it "displays error if key is nil" do
-    @command.execute(nil)
-    @output.string.should match(/You must supply an API key/)
+    installer.key = nil
+    installer.validate_key
+    output.string.should match(/You must supply an API key/)
   end
 
   it "displays error if the key is there but isn't valid on localeapp.com" do
-    @command.stub!(:check_key).and_return([false, {}])
-    @command.execute('API_KEY')
-    @output.string.should match(/Project not found/)
+    installer.stub!(:check_key).and_return([false, {}])
+    installer.validate_key
+    output.string.should match(/Project not found/)
+  end
+
+  it "displays project name if the key is there and valid on localeapp.com" do
+    installer.stub!(:check_key).and_return([true, valid_project_data])
+    installer.validate_key
+    output.string.should match(/Test Project/)
+  end
+end
+
+describe Localeapp::CLI::Install::DefaultInstaller, '#check_default_locale' do
+  let(:output) { StringIO.new }
+  let(:installer) { Localeapp::CLI::Install::DefaultInstaller.new(output) }
+
+  before do
+    installer.stub!(:project_data).and_return(valid_project_data)
   end
 
-  it "displays project name and base locale if the key is there and valid on localeapp.com" do
-    @command.stub!(:check_key).and_return([true, valid_project_data])
-    @command.stub!(:write_configuration_file)
-    @command.execute('API_KEY')
-    @output.string.should match(/Test Project/)
-    @output.string.should match(/en \(English\)/)
+  it "displays project base locale" do
+    installer.check_default_locale
+    output.string.should match(/en \(English\)/)
   end
 
   it "displays warning if I18n.default_locale doesn't match what's configured on localeapp.com" do
     I18n.stub(:default_locale).and_return(:es)
-    @command.stub!(:check_key).and_return([true, valid_project_data])
-    @command.stub!(:write_configuration_file)
-    @command.execute('API_KEY')
-    @output.string.should match(%r{WARNING: I18n.default_locale is es, change in config/environment.rb \(Rails 2\) or config/application.rb \(Rails 3\)})
+    installer.check_default_locale
+    output.string.should match(%r{WARNING: I18n.default_locale is es, change in config/environment.rb \(Rails 2\) or config/application.rb \(Rails 3\)})
   end
+end
+
+describe Localeapp::CLI::Install::DefaultInstaller, '#set_config_paths' do
+  let(:output) { StringIO.new }
+  let(:installer) { Localeapp::CLI::Install::DefaultInstaller.new(output) }
+
+  before do
+    installer.set_config_paths
+  end
+
+  it "sets the initializer config_file_path for a rails app" do
+    installer.config_file_path.should == "config/initializers/localeapp.rb"
+  end
+
+  it "sets the data directory for a rails app" do
+    installer.data_directory.should == "config/locales"
+  end
+end
+
+describe Localeapp::CLI::Install::DefaultInstaller, '#write_config_file' do
+  let(:output) { StringIO.new }
+  let(:config_file_path) { 'config/initializers/localeapp.rb' }
+  let(:key) { 'APIKEY' }
+  let(:installer) { Localeapp::CLI::Install::DefaultInstaller.new(output) }
 
-  it "asks the default configuration to write itself" do
-    @command.stub!(:check_key).and_return([true, valid_project_data])
-    @command.should_receive(:write_configuration_file).with('config/initializers/localeapp.rb')
-    @command.execute('API_KEY')
+  it "creates a configuration file containing just the api key" do
+    installer.key = key
+    installer.config_file_path = config_file_path
+    file = stub('file')
+    file.should_receive(:write).with <<-CONTENT
+require 'localeapp/rails'
+
+Localeapp.configure do |config|
+  config.api_key = 'APIKEY'
+end
+CONTENT
+    File.should_receive(:open).with(config_file_path, 'w+').and_yield(file)
+    installer.write_config_file
   end
+end
 
-  it "asks the configuration to write itself to .localeapp when the --standalone switch is set" do
-    @command.stub!(:check_key).and_return([true, valid_project_data])
-    @command.config_type = :standalone
-    @command.should_receive(:write_configuration_file).with('.localeapp/config.rb')
-    @command.execute('API_KEY')
+describe Localeapp::CLI::Install::DefaultInstaller, '#check_data_directory_exists' do
+  let(:output) { StringIO.new }
+  let(:data_directory) { 'locales' }
+  let(:installer) { Localeapp::CLI::Install::DefaultInstaller.new(output) }
+
+  before do
+    installer.data_directory = data_directory
   end
 
   it "displays warning if config.translation_data_directory doesn't exist" do
-    @command.stub!(:check_key).and_return([true, valid_project_data])
-    @command.stub!(:write_configuration_file)
-    @command.execute('API_KEY')
-    @output.string.should match(/Your translation data will be stored there./)
+    File.stub(:directory?).with(data_directory).and_return(false)
+    installer.check_data_directory_exists
+    output.string.should match(/Your translation data will be stored there./)
   end
 
   it "doesn't display a warning if translation_data_directory exists" do
-    @command.stub!(:check_key).and_return([true, valid_project_data])
-    @command.stub!(:write_configuration_file)
-    File.should_receive(:directory?).and_return(true)
-    @command.execute('API_KEY')
-    @output.string.should_not match(/Your translation data will be stored there./)
-  end
-
-  it "asks the github configuration to write itself" do
-    @command.stub!(:check_key).and_return([true, valid_project_data])
-    @command.config_type = :github
-    @command.should_receive(:write_github_configuration_file).with('.localeapp/config.rb', valid_project_data)
-    @command.execute('API_KEY')
+    File.stub(:directory?).with(data_directory).and_return(true)
+    installer.check_data_directory_exists
+    output.string.should == ''
+  end
+end
+
+describe Localeapp::CLI::Install::HerokuInstaller, '#write_config_file' do
+  let(:output) { StringIO.new }
+  let(:config_file_path) { 'config/initializers/localeapp.rb' }
+  let(:key) { 'APIKEY' }
+  let(:installer) { Localeapp::CLI::Install::HerokuInstaller.new(output) }
+
+  it "creates a configuration file setup for staging / production on heroku" do
+    installer.key = key
+    installer.config_file_path = config_file_path
+    file = stub('file')
+    file.should_receive(:write).with <<-CONTENT
+require 'localeapp/rails'
+
+Localeapp.configure do |config|
+  config.api_key = ENV['LOCALEAPP_API_KEY']
+  config.poll_interval = 300 if defined?(Rails) && Rails.env.staging?
+  config.polling_environments = [:development, :staging]
+  config.reloading_environments = [:development, :staging]
+  config.sending_environments = [:development, :staging]
+end
+
+# Pull latest when dyno restarts on staging
+if defined?(Rails) && Rails.env.staging?
+  Localeapp::CLI::Pull.new.execute
+end
+CONTENT
+    File.should_receive(:open).with(config_file_path, 'w+').and_yield(file)
+    installer.write_config_file
+  end
+end
+describe Localeapp::CLI::Install::StandaloneInstaller, '#check_default_locale' do
+  let(:output) { StringIO.new }
+  let(:installer) { Localeapp::CLI::Install::StandaloneInstaller.new(output) }
+
+  it "does nothing" do
+    installer.check_default_locale
+    output.string.should == ''
+  end
+end
+
+describe Localeapp::CLI::Install::StandaloneInstaller, '#set_config_paths' do
+  let(:output) { StringIO.new }
+  let(:installer) { Localeapp::CLI::Install::StandaloneInstaller.new(output) }
+
+  before do
+    installer.set_config_paths
+  end
+
+  it "sets the initializer config_file_path for a standalone app" do
+    installer.config_file_path.should == ".localeapp/config.rb"
+  end
+
+  it "sets the data directory for a standalone app" do
+    installer.data_directory.should == "locales"
+  end
+end
+
+describe Localeapp::CLI::Install::StandaloneInstaller, '#write_config_file' do
+  let(:output) { StringIO.new }
+  let(:key) { 'APIKEY' }
+  let(:config_file_path) { '.localeapp/config.rb' }
+  let(:data_directory) { 'locales' }
+  let(:installer) { Localeapp::CLI::Install::StandaloneInstaller.new(output) }
+
+  it "creates a configuration file containing the dot file configuration at the given config_file_path" do
+    installer.stub!(:create_config_dir).and_return(File.dirname(config_file_path))
+    installer.key = key
+    installer.config_file_path = config_file_path
+    installer.data_directory = data_directory
+    file = stub('file')
+    file.should_receive(:write).with <<-CONTENT
+Localeapp.configure do |config|
+  config.api_key                    = 'APIKEY'
+  config.translation_data_directory = 'locales'
+  config.synchronization_data_file  = '.localeapp/log.yml'
+  config.daemon_pid_file            = '.localeapp/localeapp.pid'
+end
+CONTENT
+    File.should_receive(:open).with(config_file_path, 'w+').and_yield(file)
+    installer.write_config_file
+  end
+end
+
+describe Localeapp::CLI::Install::GithubInstaller, '#write_config_file' do
+  let(:output) { StringIO.new }
+  let(:key) { 'APIKEY' }
+  let(:config_file_path) { '.localeapp/config.rb' }
+  let(:data_directory) { 'locales' }
+  let(:installer) { Localeapp::CLI::Install::GithubInstaller.new(output) }
+
+  before do
+    installer.key = key
+    installer.config_file_path = config_file_path
+    installer.data_directory = data_directory
+    installer.stub!(:create_config_dir).and_return(File.dirname(config_file_path))
+    installer.stub!(:write_standalone_config)
+    installer.stub!(:create_data_directory)
+    installer.stub!(:create_gitignore)
+    installer.stub!(:create_readme)
+  end
+
+  it "creates a standalone configuration file" do
+    installer.should_receive(:write_standalone_config)
+    installer.write_config_file
+  end
+
+  it "creates the data_directory" do
+    installer.should_receive(:create_data_directory)
+    installer.write_config_file
+  end
+
+  it "creates the .gitignore file" do
+    installer.should_receive(:create_gitignore)
+    installer.write_config_file
+  end
+
+  it "creates the READMI file" do
+    installer.should_receive(:create_readme)
+    installer.write_config_file
   end
 end

data/spec/localeapp/configuration_spec.rb

@@ -163,58 +163,3 @@ describe Localeapp::Configuration do
     end
   end
 end
-
-describe Localeapp::Configuration, "#write_rails_configuration(path)" do
-  it "creates a configuration file containing just the api key at the given path" do
-    configuration = Localeapp::Configuration.new
-    configuration.api_key = "APIKEY"
-    path = 'test_path'
-    file = stub('file')
-    file.should_receive(:write).with <<-CONTENT
-require 'localeapp/rails'
-
-Localeapp.configure do |config|
-  config.api_key = 'APIKEY'
-end
-CONTENT
-    File.should_receive(:open).with(path, 'w+').and_yield(file)
-    configuration.write_rails_configuration(path)
-  end
-end
-
-
-describe Localeapp::Configuration, "#write_standalone_configuration(path)" do
-  it "creates a configuration file containing the dot file configuration at the given path" do
-    configuration = Localeapp::Configuration.new
-    configuration.api_key = "APIKEY"
-    path = 'test_path'
-    file = stub('file')
-    file.should_receive(:write).with <<-CONTENT
-Localeapp.configure do |config|
-  config.api_key                    = 'APIKEY'
-  config.translation_data_directory = 'locales'
-  config.synchronization_data_file  = '.localeapp/log.yml'
-  config.daemon_pid_file            = '.localeapp/localeapp.pid'
-end
-CONTENT
-    File.should_receive(:open).with(path, 'w+').and_yield(file)
-    configuration.write_standalone_configuration(path)
-  end
-end
-
-
-describe Localeapp::Configuration, "#write_github_configuration(path, project_data)" do
-  let(:configuration) { Localeapp::Configuration.new }
-  let(:project_data) { {"name"=>"Test Project", "default_locale"=>{"name"=>"English", "code"=>"en"}} }
-  let(:path) { '.localeapp/config.rb' }
-
-  it "writes github configuration files" do
-    configuration.should_receive(:write_standalone_configuration).with(path)
-    file = stub('file')
-    file.should_receive(:write).exactly(2).times.and_return('content')
-    FileUtils.should_receive(:mkdir_p).with('locales')
-    File.should_receive(:open).with('.gitignore', 'a+').and_yield(file)
-    File.should_receive(:open).with('README.md', 'w+').and_yield(file)
-    configuration.write_github_configuration(path, project_data)
-  end
-end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,12 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-12 00:00:00 Z
+date: 2012-11-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: json
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: rest-client
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: ya2yaml
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,12 +73,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: gli
+  type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -86,12 +87,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,12 +101,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: rack
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -114,12 +115,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -130,12 +131,12 @@ dependencies:
         - 11
         - 0
         version: 2.11.0
-  type: :development
-  version_requirements: *id008
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: yard
+  type: :development
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -146,12 +147,12 @@ dependencies:
         - 6
         - 7
         version: 0.6.7
-  type: :development
-  version_requirements: *id009
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: RedCloth
+  type: :development
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -162,12 +163,12 @@ dependencies:
         - 2
         - 9
         version: 4.2.9
-  type: :development
-  version_requirements: *id010
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   name: aruba
+  type: :development
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -178,12 +179,12 @@ dependencies:
         - 4
         - 11
         version: 0.4.11
-  type: :development
-  version_requirements: *id011
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   name: fakeweb
+  type: :development
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -194,8 +195,7 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  type: :development
-  version_requirements: *id012
+  requirement: *id012
 description: Synchronizes i18n translation keys and content with localeapp.com so you don't have to manage translations by hand.
 email: 
 - chris@tigrish.com
@@ -319,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: localeapp
-rubygems_version: 1.8.24
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Easy i18n translation management with localeapp.com