supermarket 0.0.2-universal-java → 0.0.3-universal-java

data/CHANGES

@@ -0,0 +1,15 @@
+0.0.3 (10/08/20010)
+
+  * Added Sinatra based web API, deployable to GAE
+  * Categories
+
+0.0.2 (03/28/2010)
+0.0.1
+
+  * Different output formats (json, xml, html)
+  * Image output support
+  * Display all comments
+
+0.0.0 (03/23/2010)
+
+  * Initial Release

data/Gemfile

@@ -0,0 +1,15 @@
+source 'http://rubygems.org'
+
+gem "json-jruby", :require=>'json'
+
+group :development do
+  #gem "sinatra-reloader", :require=>"sinatra/reloader"
+  #gem "appengine-sdk"
+end
+
+group :web do
+  gem "sinatra",              :require=>"sinatra/base"
+  gem "rack-respond_to",      :require=>"rack/respond_to"
+  gem "rack-abstract-format", :require=>"rack/abstract_format"
+end
+

data/README.md

@@ -5,7 +5,7 @@ This is a thin JRuby wrapper for the [Android Market API](http://code.google.com
 
 It's a new project and only some parts of the protocol have been implemented. I decided to build on top of Java/JRuby because the native Ruby Protocolbuffer implementation ([ruby-protobuf](http://code.google.com/p/ruby-protobuf/)) could not properly handle the [.proto file](http://github.com/jberkel/android-market-api/blob/master/AndroidMarketApi/proto/market.proto) used by the API.
 
-## Synopis
+## Synopsis
     require 'supermarket'
     session = Supermarket::Session.new
 

data/Rakefile

@@ -0,0 +1,167 @@
+require 'rake/clean'
+require 'date'
+CLEAN.include('pkg', 'tmp')
+
+#############################################################################
+#
+# Gem related stuff
+#
+#############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+end
+
+def date
+  Date.today.to_s
+end
+
+def rubyforge_project
+  name
+end
+
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def platform
+  eval(IO.read(gemspec_file)).platform.to_s
+end
+
+def gem_file
+  "#{name}-#{version}-#{platform}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
+
+#############################################################################
+#
+# Standard tasks
+#
+#############################################################################
+
+task :default => :test
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/#{name}.rb"
+end
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master --tags"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+desc "Builds the gem"
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(head, :rubyforge_project)
+
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
+
+  # piece file back together and write
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    exit!
+  end
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
+end
+
+#############################################################################
+#
+# Appengine
+#
+#############################################################################
+
+begin
+  require 'warber'
+
+  APPENGINE_WEB_XML = "appengine-web.xml"
+  war_dir = "tmp/war"
+  directory war_dir
+
+  warbler = Warbler::Task.new
+
+  task :explode => [:clean, :war, war_dir] do
+    sh "unzip #{warbler.config.war_name}.war -d #{war_dir}"
+    sh "mv #{war_dir}/WEB-INF/{.bundle,bundle}"
+  end
+
+  task :explode_gemjar => [:clean, 'war:gemjar', :war, war_dir] do
+    sh "unzip #{warbler.config.war_name}.war -d #{war_dir}"
+  end
+
+  desc "deploy to gae"
+  task :deploy => [:explode] do
+    begin
+      require '/opt/homebrew/Cellar/app-engine-java-sdk/1.3.2/lib/appengine-tools-api.jar'
+      Java::ComGoogleAppengineToolsAdmin::AppCfg.main(['update', war_dir].to_java(:string))
+    rescue LoadError
+      sh "appcfg.sh update #{war_dir}"
+    end
+  end
+
+  namespace :bundle do
+    task :install do
+      sh "jruby -S bundle install vendor/gems --disable-shared-gems"
+    end
+  end
+
+  def app_version
+    require 'rexml/document'
+    doc = REXML::Document.new(IO.read(APPENGINE_WEB_XML))
+    REXML::XPath.first(doc, 'appengine-web-app/version').text.to_i
+  end
+rescue LoadError => e
+end

data/appengine-web.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+    <application>supermarket-api</application>
+
+    <version>6</version>
+
+    <static-files/>
+
+    <resource-files>
+    </resource-files>
+
+    <sessions-enabled>false</sessions-enabled>
+
+    <system-properties>
+      <property name="jruby.management.enabled" value="false" />
+      <property name="os.arch" value=""/>
+      <property name="jruby.compile.mode" value="JIT"/> <!-- JIT|FORCE|OFF -->
+      <property name="jruby.compile.fastest" value="true"/>
+      <property name="jruby.compile.frameless" value="true"/>
+      <property name="jruby.compile.positionless" value="true"/>
+      <property name="jruby.compile.threadless" value="false"/>
+      <property name="jruby.compile.fastops" value="false"/>
+      <property name="jruby.compile.fastcase" value="false"/>
+      <property name="jruby.compile.chainsize" value="500"/>
+      <property name="jruby.compile.lazyHandles" value="false"/>
+      <property name="jruby.compile.peephole" value="true"/>
+      <property name="jruby.debug.loadService" value="false"/>
+   </system-properties>
+</appengine-web-app>
+

data/bin/market

@@ -6,17 +6,22 @@ format = ARGV.map { |a| a[/--format=(\w+)/, 1]}.compact.first || "json"
 image  = ARGV.map { |a| a[/--image-out=([^\s]+)/, 1]}.compact.first || "image.jpg"
 
 def usage
-  puts "#{File.basename($0)} [search|comments|all_comments|image|imagedata] [query|app_id] [--format=json|xml|html] [--image-out=file]"
+  puts "#{File.basename($0)} [search|comments|all_comments|categories|image|imagedata|icondata] [query|app_id] [--format=json|xml|html] [--image-out=file]"
   exit 1
 end
 
 case command = ARGV.shift
+  when "categories"
+    puts Supermarket::Session.new.send(command).send("to_#{format.downcase}")
   when /\A(search|(all_)?comments|image)\Z/
     arg = ARGV.shift or usage
     puts Supermarket::Session.new.send(command, arg).send("to_#{format.downcase}")
   when 'imagedata'
     arg = ARGV.shift or usage
     File.open(image, 'w') { |f| f << Supermarket::Session.new.image_data(arg) }
+  when 'icondata'
+    arg = ARGV.shift or usage
+    File.open(image, 'w') { |f| f << Supermarket::Session.new.image_data(arg, :icon) }
   else usage
 end
 

data/config/warble.rb

@@ -0,0 +1,16 @@
+require File.join('lib', 'supermarket')
+
+Warbler::Config.new do |config|
+  config.dirs = %w(lib)
+  config.includes = FileList["appengine-web.xml",  "config.ru"]
+  config.webxml.booter = :rack
+
+  config.webxml.jruby.min.runtimes = 1
+  config.webxml.jruby.max.runtimes = 1
+  config.webxml.jruby.init.serial = true
+
+  market_config = Supermarket::Session.config
+  config.webxml['market_login']     = market_config['login']
+  config.webxml['market_password']  = market_config['password']
+end
+

data/config.ru

@@ -0,0 +1,13 @@
+require File.expand_path('lib/supermarket/api.rb')
+require 'rack/reloader'
+#Sinatra::Application.set :environment, :production
+use Rack::AbstractFormat
+use Rack::Reloader, 0 if Sinatra::Application.development?
+
+map '/login' do
+  run Supermarket::ClientLogin
+end
+
+map '/api' do
+  run Supermarket::Api
+end

data/lib/supermarket/api.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env jruby
+
+environment = ['.bundle', 'bundle'].map { |f|
+  File.expand_path("../../../#{f}/environment.rb", __FILE__)
+}.select { |f| File.exists?(f) }
+
+if environment.empty?
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
+else
+  require environment.first
+end
+
+require File.join(File.dirname(__FILE__), 'session')
+Bundler.require(:default, :web)
+
+module Supermarket
+  class Api < Sinatra::Base
+    include Rack::RespondTo
+    reset!
+
+    not_found do
+      content_type :json
+      [404, { 'error' => 'not found' }.to_json]
+    end
+
+    get("/:id/comments") do
+      session  = Session.new
+      if comments = session.comments(params[:id])
+        respond_to do |wants|
+          wants.json {comments.to_json}
+          wants.xml  {comments.to_xml}
+          wants.html {comments.to_html}
+        end
+      else
+        raise Sinatra::NotFound
+      end
+    end
+
+    # get("/:id/image") do
+    #   content_type :jpeg
+    #
+    #   session  = Session.new
+    #   session.image_data(params[:id])
+    # end
+
+    def respond_to
+      env['HTTP_ACCEPT'] ||= 'text/html'
+      Rack::RespondTo.env = env
+
+      super { |format|
+        yield(format).tap do |response|
+          type = Rack::RespondTo::Helpers.match(Rack::RespondTo.media_types, format).first
+          content_type(type) if type
+        end
+      }
+    end
+  end
+
+
+  class ClientLogin < Sinatra::Base
+    reset!
+  end
+end

data/lib/supermarket/formats.rb

@@ -5,20 +5,17 @@ require File.dirname(__FILE__) + "/jars/protobuf-format-java-1.2-SNAPSHOT.jar"
 #http://code.google.com/p/protobuf-java-format/
 module Supermarket
   module Formats
-    import 'com.google.protobuf.JsonFormat'
-    import 'com.google.protobuf.XmlFormat'
-    import 'com.google.protobuf.HtmlFormat'
 
     def to_json(*a)
-      JsonFormat.printToString(self)
+      Java::ComGoogleProtobuf::JsonFormat.printToString(self)
     end
 
     def to_xml
-      XmlFormat.printToString(self)
+      Java::ComGoogleProtobuf::XmlFormat.printToString(self)
     end
 
     def to_html
-      HtmlFormat.printToString(self)
+      Java::ComGoogleProtobuf::HtmlFormat.printToString(self)
     end
 
     def to_ruby

data/lib/supermarket/session.rb

@@ -19,22 +19,30 @@ module Supermarket
   class Session
     attr_reader :_session
 
-    def initialize
+    def initialize(opts={})
+      opts.merge!(self.class.config)
       @_session = MarketSession.new
-      @_session.login(config['login'], config['password'])
+      if opts['authToken']
+        @_session.setAuthToken(opts['authToken'])
+      else
+        raise "Need login and password" unless opts['login'] && opts['password']
+        @_session.login(opts['login'], opts['password'])
+      end
     end
 
-    def config_file
+
+    def self.config_file
       File.join(ENV['HOME'], '.supermarket.yml')
     end
 
-    def config
+    def self.config
       @config ||= begin
-        unless File.exists?(config_file)
-          File.open(config_file, 'w') { |f| f << YAML.dump('login'=>'someone@gmail.com', 'password'=>'secr3t') }
-          raise "Android market config file not found. Please edit #{config_file}"
+        if defined? $servlet_context
+          { 'login' => $servlet_context.getInitParameter('market_login') ,
+            'password' => $servlet_context.getInitParameter('market_password') }
+        else
+          File.exists?(config_file) ? YAML.load_file(config_file) : {}
         end
-        YAML.load_file(config_file)
       end
     end
 
@@ -48,6 +56,10 @@ module Supermarket
       execute(request)
     end
 
+    def categories()
+      request = Market::CategoriesRequest.newBuilder().build()
+      execute(request)
+    end
 
     def comments(app_id, start=0, count=10)
       raise ArgumentError, "need app id" unless app_id
@@ -60,7 +72,8 @@ module Supermarket
       if resp = execute(request)
         resp
       else
-        raise ArgumentError, "request returned nil"
+        #raise ArgumentError, "request returned nil"
+        nil
       end
     end
 
@@ -75,16 +88,23 @@ module Supermarket
       end
     end
 
-    def image(app_id, usage=Market::GetImageRequest::AppImageUsage::SCREENSHOT, image_id='1')
+    def image(app_id, usage=:screenshot, image_id='1')
+      case usage
+      when :screenshot
+        usage_const = Market::GetImageRequest::AppImageUsage::SCREENSHOT
+      when :icon
+        usage_const = Market::GetImageRequest::AppImageUsage::ICON
+      end
+
       request = Market::GetImageRequest.newBuilder().
         setAppId(pkg_to_app_id(app_id)).
-        setImageUsage(usage).
+        setImageUsage(usage_const).
         setImageId(image_id).build()
 
       execute(request)
 		end
 
-		def image_data(app_id, usage=Market::GetImageRequest::AppImageUsage::SCREENSHOT, image_id='1')
+		def image_data(app_id, usage=:screenshot, image_id='1')
       if resp = image(app_id, usage, image_id)
 		    String.from_java_bytes(resp.getImageData().toByteArray())
 	    else

data/lib/supermarket.rb

@@ -1 +1,5 @@
+module Supermarket
+  VERSION = '0.0.3'
+end
+
 require File.join(File.dirname(__FILE__), 'supermarket', 'session')

data/supermarket.gemspec

@@ -0,0 +1,46 @@
+Gem::Specification.new do |s|
+  s.name = 'supermarket'
+  s.version = '0.0.3'
+  s.platform = 'universal-java'
+
+  s.rubyforge_project = 'supermarket'
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jan Berkel"]
+  s.date = '2010-08-10'
+  s.default_executable = %q{market}
+  s.description = %q{An unoffical/reverse engineered API for Android market.}
+  s.email = %q{jan.berkel@gmail.com}
+  s.executables = ["market"]
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+
+  # = MANIFEST =
+  s.files = %w[
+    CHANGES
+    Gemfile
+    README.md
+    Rakefile
+    appengine-web.xml
+    bin/market
+    config.ru
+    config/warble.rb
+    lib/supermarket.rb
+    lib/supermarket/api.rb
+    lib/supermarket/formats.rb
+    lib/supermarket/jars/AndroidMarketApi.jar
+    lib/supermarket/jars/protobuf-format-java-1.2-SNAPSHOT.jar
+    lib/supermarket/jars/protobuf-java-2.2.0.jar
+    lib/supermarket/session.rb
+    supermarket.gemspec
+  ]
+  # = MANIFEST =
+  s.homepage = %q{http://github.com/jberkel/supermarket}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{JRuby bindings for android-market-api}
+
+   s.add_dependency(%q<json-jruby>, [">= 0"])
+end
+

metadata

@@ -3,75 +3,83 @@ name: supermarket
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+    - 0
+    - 0
+    - 3
+  version: 0.0.3
 platform: universal-java
 authors: 
-- Jan Berkel
+  - Jan Berkel
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 +02:00
+date: 2010-08-10 00:00:00 +02:00
 default_executable: market
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json-jruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: json-jruby
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :runtime
+    version_requirements: *id001
 description: An unoffical/reverse engineered API for Android market.
 email: jan.berkel@gmail.com
 executables: 
-- market
+  - market
 extensions: []
 
 extra_rdoc_files: 
-- README.md
+  - README.md
 files: 
-- bin/market
-- lib/supermarket.rb
-- lib/supermarket/formats.rb
-- lib/supermarket/jars/AndroidMarketApi.jar
-- lib/supermarket/jars/protobuf-format-java-1.2-SNAPSHOT.jar
-- lib/supermarket/jars/protobuf-java-2.2.0.jar
-- lib/supermarket/session.rb
-- README.md
+  - CHANGES
+  - Gemfile
+  - README.md
+  - Rakefile
+  - appengine-web.xml
+  - bin/market
+  - config.ru
+  - config/warble.rb
+  - lib/supermarket.rb
+  - lib/supermarket/api.rb
+  - lib/supermarket/formats.rb
+  - lib/supermarket/jars/AndroidMarketApi.jar
+  - lib/supermarket/jars/protobuf-format-java-1.2-SNAPSHOT.jar
+  - lib/supermarket/jars/protobuf-java-2.2.0.jar
+  - lib/supermarket/session.rb
+  - supermarket.gemspec
 has_rdoc: true
 homepage: http://github.com/jberkel/supermarket
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: supermarket
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3