etvnet-seek 0.7.2 → 0.8.0

data/Gemfile

@@ -1,14 +1,24 @@
 source "http://rubygems.org"
 
-gem "gemcutter"
-gem "jeweler"
-gem "sinatra"
 gem "nokogiri"
 gem "libxml-ruby"
-gem "zipit"
-gem "highline"
 gem "json_pure"
-gem "rake"
 
-gem "rspec", :require => "spec"
-gem "mocha"
+group :development do
+  gem "jeweler"
+  gem "gemcutter"
+  gem "rake"
+  gem "highline"
+  gem "zipit"
+
+  gem 'ruby-debug-base19' if RUBY_VERSION.include? "1.9"
+  gem 'ruby-debug-base' if RUBY_VERSION.include? "1.8"
+  gem "ruby-debug-ide"  
+end
+
+group :test do
+  gem "mocha"
+  gem "rspec", "2.2.0"
+  gem "rcov"
+end
+

data/README

@@ -10,7 +10,7 @@
 
 Usage: etvnet-seek [options] keywords
     -s, --search                     Display Search Menu
-    -r, --runglish                   Enter russian keywords in translit
+    -t, --translit                   Enter russian keywords in translit
     -b, --best-hunred                Display Best 100 Menu
     -n, --new_items                  Display New Items Menu
     -p, --premier                    Display Premier of the Week Menu

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
 
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 begin
   require 'zipit'
@@ -40,6 +40,29 @@ task :zip do
   zip :archive => "etvnet-seek.zip", :dir => "."
 end
 
+desc "Release the gem"
+task :"release:gem" do
+  %x(
+      rm -rf pkg
+      rake gemspec
+      rake build
+      rake install
+      git add .
+  )
+  puts "Commit message:"
+  message = STDIN.gets
+
+  version = "#{File.open(File::dirname(__FILE__) + "/VERSION").readlines().first}"
+
+  %x(
+    git commit -m "#{message}"
+
+    git push origin master
+
+    gem push pkg/#{File.basename(File.expand_path("."))}-#{version}.gem
+  )
+end
+
 desc "Run gem code locally"
 task :"run:gem" do
   command = "bin/etvnet-seek"
@@ -47,10 +70,9 @@ task :"run:gem" do
 end
 
 # configure rspec
-Spec::Rake::SpecTask.new do |spec|
- spec.spec_files = FileList["spec/**/*_spec.rb"]
- spec.spec_opts << "--color"
- spec.libs += ["lib", "spec"]
+RSpec::Core::RakeTask.new do |task|
+  task.pattern = 'spec/**/*_spec.rb'
+  task.verbose = false
 end
 
 task :default => :zip

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

data/bin/etvnet-seek

@@ -8,16 +8,21 @@ $:.unshift(File::join(File::dirname(File::dirname(__FILE__)), "lib"))
 $KCODE='u'
 
 require 'etvnet_seek/etvnet_seek'
-require 'etvnet_seek/main'
 
 trap('INT') { puts "Program was interrupted..."; exit }
 
 client = Main.new
 
-link_info = client.seek ARGV.join(' ')
+link_info = nil
+
+begin
+  link_info = client.process ARGV.join(' ')
+rescue Exception => e
+  puts e.message
+end
 
 if not link_info.nil? and link_info.resolved?
-  puts "Link #{link_info.text} [#{link_info.name} (#{link_info.media_file})]: #{link_info.link}"
+  puts "Link #{link_info.text} [(#{link_info.media_file})]: #{link_info.link}"
   #puts "#{link_info.rtsp_link}"
 
   launch = ask("Launch link (y/n)?")

data/etvnet-seek.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{etvnet-seek}
-  s.version = "0.7.2"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Shvets"]
-  s.date = %q{2010-07-11}
+  s.date = %q{2010-12-04}
   s.default_executable = %q{etvnet-seek}
   s.description = %q{Command line tool for getting mms urls from etvnet service.}
   s.email = %q{alexander.shvets@gmail.com}
@@ -19,52 +19,59 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "CHANGES",
-     "Gemfile",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "bin/etvnet-seek",
-     "bin/etvnet-seek.bat",
-     "etvnet-seek.gemspec",
-     "lib/etvnet_seek/commander.rb",
-     "lib/etvnet_seek/cookie_helper.rb",
-     "lib/etvnet_seek/core/access_page.rb",
-     "lib/etvnet_seek/core/base_page.rb",
-     "lib/etvnet_seek/core/browse_media_item.rb",
-     "lib/etvnet_seek/core/catalog_item.rb",
-     "lib/etvnet_seek/core/catalog_page.rb",
-     "lib/etvnet_seek/core/channel_media_item.rb",
-     "lib/etvnet_seek/core/channels_page.rb",
-     "lib/etvnet_seek/core/group_media_item.rb",
-     "lib/etvnet_seek/core/group_page.rb",
-     "lib/etvnet_seek/core/home_page.rb",
-     "lib/etvnet_seek/core/login_page.rb",
-     "lib/etvnet_seek/core/media_info.rb",
-     "lib/etvnet_seek/core/media_item.rb",
-     "lib/etvnet_seek/core/media_page.rb",
-     "lib/etvnet_seek/core/new_item.rb",
-     "lib/etvnet_seek/core/new_items_page.rb",
-     "lib/etvnet_seek/core/page.rb",
-     "lib/etvnet_seek/core/page_factory.rb",
-     "lib/etvnet_seek/core/search_page.rb",
-     "lib/etvnet_seek/core/service_call.rb",
-     "lib/etvnet_seek/easy_auth.rb",
-     "lib/etvnet_seek/etvnet_seek.rb",
-     "lib/etvnet_seek/link_info.rb",
-     "lib/etvnet_seek/main.rb",
-     "lib/etvnet_seek/user_selection.rb",
-     "lib/media_converter.rb",
-     "lib/progressbar.rb",
-     "lib/runglish.rb"
+    "Gemfile",
+    "README",
+    "Rakefile",
+    "VERSION",
+    "bin/etvnet-seek",
+    "bin/etvnet-seek.bat",
+    "etvnet-seek.gemspec",
+    "lib/etvnet_seek/accessor.rb",
+    "lib/etvnet_seek/commander.rb",
+    "lib/etvnet_seek/cookie_helper.rb",
+    "lib/etvnet_seek/core/access_page.rb",
+    "lib/etvnet_seek/core/audio_page.rb",
+    "lib/etvnet_seek/core/best_hundred_page.rb",
+    "lib/etvnet_seek/core/browse_media_item.rb",
+    "lib/etvnet_seek/core/catalog_item.rb",
+    "lib/etvnet_seek/core/catalog_page.rb",
+    "lib/etvnet_seek/core/channel_media_item.rb",
+    "lib/etvnet_seek/core/channels_page.rb",
+    "lib/etvnet_seek/core/group_media_item.rb",
+    "lib/etvnet_seek/core/group_page.rb",
+    "lib/etvnet_seek/core/home_page.rb",
+    "lib/etvnet_seek/core/items_page.rb",
+    "lib/etvnet_seek/core/items_page_factory.rb",
+    "lib/etvnet_seek/core/login_page.rb",
+    "lib/etvnet_seek/core/media_info.rb",
+    "lib/etvnet_seek/core/media_item.rb",
+    "lib/etvnet_seek/core/media_page.rb",
+    "lib/etvnet_seek/core/new_item.rb",
+    "lib/etvnet_seek/core/new_items_page.rb",
+    "lib/etvnet_seek/core/page.rb",
+    "lib/etvnet_seek/core/premiere_page.rb",
+    "lib/etvnet_seek/core/radio_page.rb",
+    "lib/etvnet_seek/core/search_page.rb",
+    "lib/etvnet_seek/core/service_call.rb",
+    "lib/etvnet_seek/core/top_this_week_page.rb",
+    "lib/etvnet_seek/easy_auth.rb",
+    "lib/etvnet_seek/etvnet_seek.rb",
+    "lib/etvnet_seek/link_info.rb",
+    "lib/etvnet_seek/main.rb",
+    "lib/etvnet_seek/user_selection.rb",
+    "lib/media_converter.rb",
+    "lib/progressbar.rb",
+    "lib/runglish.rb"
   ]
   s.homepage = %q{http://github.com/shvets/etvnet-seek}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.requirements = ["none"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Accessing etvnet service from command line.}
   s.test_files = [
-    "spec/etvnet_seek_spec.rb"
+    "spec/etvnet_seek_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/unit/pages_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -72,6 +79,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<libxml-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<gemcutter>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<highline>, [">= 0"])
+      s.add_development_dependency(%q<zipit>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug-base>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug-ide>, [">= 0"])
       s.add_runtime_dependency(%q<json_pure>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<highline>, [">= 1.5.1"])
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 1.1.3"])
@@ -79,6 +96,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
     else
+      s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<libxml-ruby>, [">= 0"])
+      s.add_dependency(%q<json_pure>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<gemcutter>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<highline>, [">= 0"])
+      s.add_dependency(%q<zipit>, [">= 0"])
+      s.add_dependency(%q<ruby-debug-base>, [">= 0"])
+      s.add_dependency(%q<ruby-debug-ide>, [">= 0"])
       s.add_dependency(%q<json_pure>, [">= 1.2.0"])
       s.add_dependency(%q<highline>, [">= 1.5.1"])
       s.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])
@@ -87,6 +114,16 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
     end
   else
+    s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<libxml-ruby>, [">= 0"])
+    s.add_dependency(%q<json_pure>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<gemcutter>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<highline>, [">= 0"])
+    s.add_dependency(%q<zipit>, [">= 0"])
+    s.add_dependency(%q<ruby-debug-base>, [">= 0"])
+    s.add_dependency(%q<ruby-debug-ide>, [">= 0"])
     s.add_dependency(%q<json_pure>, [">= 1.2.0"])
     s.add_dependency(%q<highline>, [">= 1.5.1"])
     s.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])

data/lib/etvnet_seek/accessor.rb

@@ -0,0 +1,64 @@
+require 'etvnet_seek/cookie_helper'
+require 'etvnet_seek/core/access_page'
+require 'etvnet_seek/core/login_page'
+require 'etvnet_seek/link_info'
+
+class Accessor
+  def initialize cookie_file_name, credentials_collector
+    @cookie_helper = CookieHelper.new cookie_file_name
+    @credentials_collector = credentials_collector
+
+    @access_page = AccessPage.new
+    @login_page = LoginPage.new
+  end
+
+  def access item, *params
+    @try_again = false
+
+    cookie = @cookie_helper.load_cookie
+
+    if cookie.nil?
+      username, password = *@credentials_collector.call(*params)
+
+      @try_again = login(username, password)
+
+      nil
+      #access item
+    else
+      cookie.gsub!("\"", "\"\"")
+
+      result1 = cookie.scan(/.*sessid=([\d|\w]*);.*/)      
+      result2 = cookie.scan(/.*_lc=([\d|\w]*);.*/)
+
+      short_cookie = "sessid=#{result1[0][0]};_lc=#{result2[0][0]}"
+      media_info = @access_page.request_media_info(item.link.scan(/.*\/(\d*)\//)[0][0], short_cookie)
+
+      if media_info.session_expired?
+        @cookie_helper.delete_cookie
+
+        username, password = *@credentials_collector.call(*params)
+
+        @try_again = login(username, password)
+
+        nil
+
+        #access item
+      else
+        LinkInfo.new(item, media_info)
+      end
+    end
+  end
+
+  def try_again?
+    @try_again
+  end
+  
+  def login username, password
+    cookie = @login_page.login(username, password)
+
+    @cookie_helper.save_cookie cookie
+
+    cookie.nil?
+  end
+
+end

data/lib/etvnet_seek/commander.rb

@@ -9,22 +9,24 @@ class Commander
     @options[:search]
   end
 
-  def runglish_mode?
-    @options[:runglish]
+  def translit_mode?
+    @options[:translit]
   end
 
   def get_initial_mode
-    if @options[:search] == true
+    if @options[:search] or @options[:translit]
       'search'
-    elsif @options[:best_hundred] == true
+    elsif @options[:best_hundred]
       'best_hundred'
-    elsif @options[:channels] == true
+    elsif @options[:top_this_week]
+      'top_this_week'
+    elsif @options[:channels]
       'channels'
-    elsif @options[:catalog] == true
+    elsif @options[:catalog]
       'catalog'
-    elsif @options[:new_items] == true
+    elsif @options[:new_items]
       'new_items'
-    elsif @options[:premiere] == true
+    elsif @options[:premiere]
       'premiere'
     else
       'main'
@@ -45,32 +47,37 @@ class Commander
       opts.banner = "Usage: etvnet-seek [options] keywords"
 
       options[:search] = false
-      opts.on('-s', '--search', 'Display Search Menu') do
+      opts.on('-s', '--search', 'Search programs') do
         options[:search] = true
       end
 
-      options[:runglish] = false
-      opts.on('-r', '--runglish', 'Enter russian keywords in translit') do
-        options[:runglish] = true
+      options[:translit] = false
+      opts.on('-t', '--translit', 'Search programs in translit') do
+        options[:translit] = true
       end
 
       options[:best_hundred] = false
-      opts.on('-b', '--best-hundred', 'Display Best 100 Menu') do
+      opts.on('-b', '--best-hundred', 'Best 100 Menu') do
         options[:best_hundred] = true
       end
 
+      options[:top_this_week] = false
+      opts.on('-w', '--top_this_week', 'Top This Week') do
+        options[:top_this_week] = true
+      end
+
       options[:channels] = false
-      opts.on('-c', '--channels', 'Display Channels Menu') do
+      opts.on('-c', '--channels', 'Channels Menu') do
         options[:channels] = true
       end
 
       options[:catalog] = false
-      opts.on('-a', '--catalog', 'Display Catalog Menu') do
+      opts.on('-a', '--catalog', 'Catalog Menu') do
         options[:catalog] = true
       end
 
       options[:main] = false
-      opts.on('-m', '--main', 'Display Main Menu') do
+      opts.on('-m', '--main', 'Main Menu') do
         options[:main] = true
       end
 
@@ -90,16 +97,25 @@ class Commander
         puts opts
         exit
       end
+
+#      opts.on('-r', '--require', '') do
+#      end
+#
+#      opts.on('-f', '--format', '') do
+#      end
+#
+#      opts.on('-e', '--example', '') do
+#      end
     end
 
     optparse.parse!
 
-    if options[:runglish] && !options[:search]
-      puts "Please use -r option together with -s option."
-      exit
-    end
+#    if options[:runglish] && !options[:search]
+#      puts "Please use -r option together with -s option."
+#      exit
+#    end
 
     options
   end
 
-end
+end