phrase 0.0.2 → 0.0.3

data/lib/phrase/tool.rb

@@ -53,24 +53,23 @@ module PhraseGem
         puts "No config present. Please initialize phrase before pushing or pulling."
         exit(43)
       end
-      
-      files.each do |file|
-        if file.split('.').last != 'yml'
-          $stderr.puts "Currently only .yml files are supported."
-          exit(43)
-        end
-      end
-      
+          
       upload_files(files, config)
     end
 
     def choose_files_to_upload
       file_name = args[1]
+      
       unless file_name
-        $stderr.puts "Need either a file or directory:"
-        $stderr.puts " phrase push FILE"
-        $stderr.puts " phrase push DIRECTORY"
-        exit(46)
+        if self.class.rails_default_locale_folder_is_available
+          file_name = self.class.rails_default_locale_folder
+          puts "No file or directory specified, using #{self.class.rails_default_locale_folder}"
+        else 
+          $stderr.puts "Need either a file or directory:"
+          $stderr.puts " phrase push FILE"
+          $stderr.puts " phrase push DIRECTORY"
+          exit(46)
+        end
       end
 
       unless File.exist?(file_name)
@@ -87,22 +86,35 @@ module PhraseGem
 
     def upload_files(files, config)
       files.each do |file|
-        puts "Uploading #{file}..."
-        params = {
-          'auth_token'=>config.secret,
-          'filename'=> file,
-          'file_content' => File.read(file)
-        }
+        proceed_with_upload = true
         
-        http = http_client(config)
+        if File.directory?(file)
+          proceed_with_upload = false
+        end
         
-        request = Net::HTTP::Post.new("#{config.api_path_prefix}/translation_keys/upload")
-        request.set_form_data(params)
-        res = http.request(request)
-
-        dump_summary_to_file(res, file)
-        unless res.code.to_s =~ /^[23]/
-          print_server_error(res, file)
+        if is_yaml_file(file)
+          proceed_with_upload = false
+          $stderr.puts "Error: Could not upload #{file} (extension not supported)"
+        end
+        
+        if proceed_with_upload
+          puts "Uploading #{file}..."
+          params = {
+            'auth_token'=>config.secret,
+            'filename'=> file,
+            'file_content' => File.read(file)
+          }
+
+          http = http_client(config)
+        
+          request = Net::HTTP::Post.new("#{config.api_path_prefix}/translation_keys/upload")
+          request.set_form_data(params)
+          res = http.request(request)
+
+          dump_summary_to_file(res, file)
+          unless res.code.to_s =~ /^[23]/
+            print_server_error(res, file)
+          end
         end
       end
     end
@@ -180,5 +192,17 @@ USAGE
       http.ca_file = File.join(File.dirname(__FILE__), "..", "..", "cacert.pem")
       http
     end
+    
+    def is_yaml_file(filepath)
+      !File.directory?(filepath) && filepath.split('.').last != 'yml'
+    end
+    
+    def self.rails_default_locale_folder
+      "./config/locales/"
+    end
+    
+    def self.rails_default_locale_folder_is_available
+      File.exist?(rails_default_locale_folder) && File.directory?(rails_default_locale_folder)
+    end
   end
 end

data/phrase.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "phrase"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Dynport GmbH"]
   s.email = ["info@phraseapp.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000Z
+date: 2012-03-16 00:00:00.000000000Z
 dependencies: []
 description: The best way to manage i18n.
 email: