getlocal 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32fad14425e0c9d1ac334b685859a7d4e5eccb65
-  data.tar.gz: ef7b2325fd7435f3a15d4c4bae23c52683028ef7
+  metadata.gz: e958e892452a0d3f63f2694a9c2521c8c1d907eb
+  data.tar.gz: 761bf80f42ad3a85aed5c34a4bf31c54b153e0d0
 SHA512:
-  metadata.gz: 4efd1312b6b38dcf7c481ecc79e8c4a39c941f4271c73d40832c2d94acd8bd4228761427729c3cf714c4e34fa0bc00f43c36d30dc878745a74825e82f5e53a77
-  data.tar.gz: 85bb53071266fbbe905b16df4d62e32c24f63c11e833ab38b271defd53b0b3f88a53b6932e15be5ed2449b4866b99a5eae97647d1731142d8d9ceef42f63d287
+  metadata.gz: 0079e0e27d6637e97452b92e2033c81134fa10cf57e28a1bb807df52ec9567a5f20cb36abf4f5f2d754d575648348c2685ebb229e5b21b2b11d295c6e76469de
+  data.tar.gz: 0506c7f248f276eb7c4de6a2bcf11c6aabf945f3822ef844bc6b741d9bd4008663aa1c9a0b195def4623173b9dd126c21546408d1b5b30a015cbf1ee36641bc4

data/getlocal.gemspec

@@ -20,10 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", '~> 10.3'
-  
+
   spec.add_dependency "thor", '~> 0.19'
   spec.add_dependency "json", '~> 1.8'
   spec.add_dependency "httmultiparty", '~> 0.3'
   spec.add_dependency "rubyzip", '~> 1.1'
-  
+  spec.add_dependency "powerbar", '~> 1.0'
+
 end

data/lib/getlocal/cli.rb

@@ -6,6 +6,7 @@ require 'io/console'
 
 require 'thor'
 require 'httmultiparty'
+require 'powerbar'
 
 require 'getlocal'
 
@@ -38,68 +39,78 @@ module Getlocal
         puts ""
       end
 
-      if !options[:verbose] then
-        Thread.new do
-          #set up spinner
-          glyphs = ['|', '/', '-', "\\"]
-          while true
-            glyphs.each do |g|
-              print "\r#{g}"
-              sleep 0.15
-            end
-          end
-        end
-      end
+      p = PowerBar.new
 
       auth = {:username => username, :password => password}
 
-      puts "Fetching the zip. This may take a while" if options[:verbose]
+      # Find all the languages we support
+      supportedLanguages = []
+      Dir.glob("*.lproj") do |filePath|
+        f = File.basename(filePath, ".*")
+        supportedLanguages << f unless f == "Base"
+      end
 
-      zipfile = Tempfile.new("file")
+      puts "Fetching localisations for" if options[:verbose]
+      puts "" if options[:verbose]
 
-      begin
-  	  	response = HTTParty.get("https://api.getlocalization.com/#{project}/api/translations/zip/", :basic_auth => auth, :timeout => options[:timeout])
-      rescue
-        puts "Oh no, somthing fucked up."
-        return
-      else
-        if response.code == 200
-          puts "Zip downloaded" if options[:verbose]
-          zipfile.binmode # This might not be necessary depending on the zip file
-          zipfile.write(response.body)
-        elsif response.code == 401
-          puts "The username or password are invailed"
-          return
-        else
-          puts "Bad response. Close but no cigar."
-          return
-        end
-      ensure
-        zipfile.close
-      end
+      total = Dir.glob("Base.lproj/*.strings").count * supportedLanguages.count
+      current = 0
+
+      # Loop through the string files we have localy
+      Dir.glob("Base.lproj/*.strings") do |stringFilePath|
 
-      puts "Extracting the zip" if options[:verbose]
-      Zip::File.open(zipfile.path) do |zipFile|
-        # Handle entries one by one
-        zipFile.each do |entry|
-          # Extract to correct location
-          pathComponents = entry.name.split("/")
+        fileName = File.basename(stringFilePath)
+        puts "-- #{fileName} --" if options[:verbose]
+        puts "" if options[:verbose]
 
-          destFolder = pathComponents[0] + '.lproj'
-          destFile = pathComponents[1]
+        # Request the translations for each supported language
+        supportedLanguages.each do |lang|
 
-          destPath = destFolder + '/' + destFile
+          current = current.next
+          p.show(:msg => 'Fetching Translation', :done => current, :total => total) unless options[:verbose]
 
-          if Dir.exists?(destFolder)
-            puts "Extracting #{destFile} to #{destPath}" if options[:verbose]
-            File.delete(destPath) if File.exist?(destPath)
-            entry.extract(destPath)
+          tempfile = Tempfile.new("file")
+
+          puts "Fetching #{lang} for #{fileName}." if options[:verbose]
+          begin
+            response = HTTParty.get("https://api.getlocalization.com/#{project}/api/translations/file/#{fileName}/#{lang}/", :basic_auth => auth, :timeout => options[:timeout])
+          rescue
+            puts "Oh no, somthing fucked up."
+            return
           else
-            puts destFolder + " folder not found. Couldn't import " + destFile if options[:verbose]
+            if response.code == 200
+              puts "File downloaded" if options[:verbose]
+              tempfile.binmode # This might not be necessary depending on the zip file
+              tempfile.write(response.body)
+
+
+              destFolder = lang + ".lproj"
+              destFile = fileName
+
+              destPath = destFolder + '/' + destFile
+
+              puts "moveing translations to #{destPath}" if options[:verbose]
+
+              if Dir.exists?(destFolder)
+                File.delete(destPath) if File.exist?(destPath)
+                FileUtils.mv(tempfile.path, destPath)
+              else
+                puts destFolder + " folder not found. Couldn't import " + destFile if options[:verbose]
+              end
+            elsif response.code == 401
+              puts "The username or password are invailed"
+              return
+            else
+              puts "Bad response. Close but no cigar."
+              puts "Sorry couldn't get #{lang} translations this time."
+            end
+          ensure
+            tempfile.close
           end
-
+          puts "" if options[:verbose]
         end
-
+        puts "" if options[:verbose]
+        puts "" if options[:verbose]
       end
 
     end
@@ -157,7 +168,6 @@ module Getlocal
 
         body = {"file" => File.new(stringFilePath)}
 
-
         if alreadyExists
           # Update master
           puts "Updateing " + stringFilePath if options[:verbose]

data/lib/getlocal/version.rb

@@ -1,3 +1,3 @@
 module Getlocal
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: getlocal
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Benjamin Briggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: powerbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: This is a in house tool developed by Palringo to help interface with
   the GetLocaization API
 email:
@@ -103,7 +117,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -123,17 +137,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A simple tool to make keeping GetLocalisation up to date