fetchapp 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 566b317b11dd0d25a4254e13e768a6435d474776
-  data.tar.gz: 9307e6f355c7aa7e069a88c7b55ce4ef90ea77fb
+  metadata.gz: 3db0ba736a453933a9232c6b648a900bcdb59cbc
+  data.tar.gz: f0ab52dcece714187995ac863c8287ea2e328340
 SHA512:
-  metadata.gz: a51869608bbedd95f3e332be2a08042468927e3b96a56bd6a96456369fcc7e16d4eaceef4dfcb785b904bce6263305476f2f92b38fd4a3493ab3aac4c1dc6ae8
-  data.tar.gz: f91a33c94320120073ca293e08e426781bbd6fe7cc8ac26f079b161f00271679ea9ce365e182abb85d38883dfc7bab6cb243b05a9ebd5bc8b6110ce89bc0813c
+  metadata.gz: 07f7ab9b070b90365287434d737b1f43204e5dc6499e0803811728079edb0da8e3d1b6bd58d042600d833757e8b5b68359f6b7d34599a281656dd7ccecf67545
+  data.tar.gz: 01df35d5d9786bfce47cdebfd3869a89d9ce886ea1e4d2506e974e839658ffc943ac32e18ddcdc2190a89b44a671245dd7ede57b8a6a1b2be371a91bbf694557

data/lib/ConditionFetch.rb

@@ -1,67 +1,71 @@
 class ConditionFetch
-    
+
     def self.fetch_ios_apple(json_body,type_value)
+
         #fetch content key
-        track_name_key="trackName"
-        track_id_key="trackId"
-        niminum_os_version_key="minimumOsVersion"
-        track_url_key="trackViewUrl"
-        bundle_id_key="bundleId"
-        version_key="version"
-        kind_key="kind"
-        
+        @@track_name_key="trackName"
+        @@track_id_key="trackId"
+        @@niminum_os_version_key="minimumOsVersion"
+        @@track_url_key="trackViewUrl"
+        @@bundle_id_key="bundleId"
+        @@version_key="version"
+        @@price_key="price"
+        @@kind_key="kind"
         isCondition=false
         
         final_apps=Array.new
         results_array=json_body["results"]
         results_array.each do |result|
-            if result[kind_key]
+            if result[@@kind_key]
+              if type_value != nil
               if result[kind_key] == "software"
                 support_array=result["supportedDevices"]
                 if  support_array
                     support_content= support_array.join
+                    puts support_content.upcase
                     if support_content.upcase.include? type_value.upcase
-                      track_name=result[track_name_key]
-                      track_id =result[track_id_key]
-                      track_nimi_os=result[niminum_os_version_key]
-                      track_url=result[track_url_key]
-                      track_bundle_id=result[bundle_id_key]
-                      track_version=result[version_key]
-                      
-                      app=Hash.new
-                      app[track_name_key]=track_name
-                      app[track_id_key]=track_id
-                      app[niminum_os_version_key]=track_nimi_os
-                      app[track_url_key]=track_url
-                      app[bundle_id_key]=track_bundle_id
-                      app[version_key]=track_version
+                      app = self.parse_result(result)
                       
                       final_apps << app
                       
                     end
                 end
                 elsif result[kind_key].upcase.include? type_value.upcase
-                    track_name=result[track_name_key]
-                    track_id =result[track_id_key]
-                    track_nimi_os=result[niminum_os_version_key]
-                    track_url=result[track_url_key]
-                    track_bundle_id=result[bundle_id_key]
-                    track_version=result[version_key]
-
-                    app=Hash.new
-                    app[track_name_key]=track_name
-                    app[track_id_key]=track_id
-                    app[niminum_os_version_key]=track_nimi_os
-                    app[track_url_key]=track_url
-                    app[bundle_id_key]=track_bundle_id
-                    app[version_key]=track_version
+                    app = self.parse_result(result)
 
                     final_apps << app
               end
+               else
+              app = self.parse_result(result)
+                      
+               final_apps << app
+            end
             end
         end
-        
         return final_apps
     end
+
+    def  self.parse_result(result)
+
+      track_name=result[@@track_name_key]
+      track_id =result[@@track_id_key]
+      track_nimi_os=result[@@niminum_os_version_key]
+      track_url=result[@@track_url_key]
+      track_bundle_id=result[@@bundle_id_key]
+      track_version=result[@@version_key]
+      track_price=result[@@price_key]
+
+      app=Hash.new
+      app[@@track_name_key]=track_name
+      app[@@track_id_key]=track_id
+      app[@@niminum_os_version_key]=track_nimi_os
+      app[@@track_url_key]=track_url
+      app[@@bundle_id_key]=track_bundle_id
+      app[@@version_key]=track_version
+      app[@@price_key]=track_price.to_s
+
+      return app
+      
+    end
 end
 

data/lib/FetchItunes.rb

@@ -10,12 +10,24 @@ module FetchItunes
     arg_flags=ARGV
     flags=Array.new
     
-    type_key="-t"
+    type_key="-type"
     type_value=nil
-    
-    all_info_key="-a"
+
+    name_key="-name"
+    name_value=""
+
+    id_key="-id"
+    id_value=""
+
+    apple_key="-apple"
+    isApple=true
+
+    all_info_key="-all"
     isAll=false
     
+    limit_key="-count"
+    limit_value = "200"
+    
     arg_flags.each do |flag|
       if flag  == type_key 
          flag_content_index=arg_flags.index(flag) +1
@@ -23,6 +35,20 @@ module FetchItunes
          type_value=arg_flags[flag_content_index];
       elsif flag  == all_info_key 
          isAll=true
+      elsif flag  == name_key
+          flag_content_index=arg_flags.index(flag) +1
+          raise "args name not match !"   if arg_flags.count <= flag_content_index
+          name_value=arg_flags[flag_content_index];
+          isApple=false
+      elsif flag  == id_key
+          flag_content_index=arg_flags.index(flag) +1
+          raise "args id not match !"   if arg_flags.count <= flag_content_index
+          id_value=arg_flags[flag_content_index];
+          isApple =false
+      elsif flag  == limit_key
+          flag_content_index=arg_flags.index(flag) +1
+          raise "args id not match !"   if arg_flags.count <= flag_content_index
+          limit_value=arg_flags[flag_content_index];
       end
     end
     
@@ -33,11 +59,18 @@ module FetchItunes
     track_url_key="trackViewUrl"
     bundle_id_key="bundleId"
     version_key="version"
+    price_key="price"
     
     request = HTTPItunesGetRequest.new
-    request.item_id="284417353"
+    if isApple
+        request.item_id="284417353"
+    elsif !id_value.nil?
+        request.item_id=id_value
+    end
     request.country="cn"
     request.entity="software"
+    request.name=name_value
+    request.limit=limit_value
     json_body= request.getItemInfos
     
     fetch_items= ConditionFetch.fetch_ios_apple(json_body,type_value)
@@ -48,6 +81,7 @@ module FetchItunes
       track_url=item[track_url_key]
       bundle_id=item[bundle_id_key]
       version=item[version_key]
+      price=item[price_key]
       
       space=" : "
       
@@ -58,6 +92,7 @@ module FetchItunes
         puts track_url_key +   space + track_url
         puts bundle_id_key +   space + bundle_id.to_s
         puts version_key +   space + version
+        puts price_key +   space + price
       elsif
         puts "------#{name}------#{bundle_id}---------"
       end

data/lib/HTTPItunesGetRequest.rb

@@ -9,15 +9,21 @@ class HTTPItunesGetRequest
       attr_accessor :item_id
       attr_accessor :country
       attr_accessor :entity
+      attr_accessor :name
+      attr_accessor :limit
       
       def initialize
-        @base_url="https://itunes.apple.com/lookup?"
+        @base_url="https://itunes.apple.com/"
+        @method= "lookup?"
+        @limit="200"
       end
       
       def getItemInfos
         begin
-          raise "Item_id is empty" if @item_id.empty?
-          full_url=@base_url + "id=#{@item_id}" + "&country=#{@country}" + "&entity=#{@entity}" + "&limit=200";
+          raise "Itemid and name is empty" if @item_id.empty? && @name.empty?
+          @method = name.length ==0 ? "lookup?" : "search?" 
+          full_url=@base_url + @method + (name.length ==0 ? "id=#{@item_id}" : "term=#{@name}") + "&country=#{@country}" + "&entity=#{@entity}" + "&limit=#{@limit}";
+          puts full_url
           uri=URI(full_url);
           puts "start request ....."
           res=Net::HTTP.get_response(uri)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetchapp
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - chengkai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies: []
 description: fetch apple app
 email: chengkai@1853.com
@@ -17,10 +17,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/fetchapp
 - lib/ConditionFetch.rb
 - lib/FetchItunes.rb
 - lib/HTTPItunesGetRequest.rb
-- bin/fetchapp
 homepage: http://rubygems.org/gems/fetchapp
 licenses: []
 metadata: {}
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: fetch app