slapp 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ce9903469327aab318ff50b88cc417d94b4836c
-  data.tar.gz: 94b5b1081d35d9efe684984ba14b3b632cc95b83
+  metadata.gz: 069be1a726d2449efa13cb54319bc8d934350c27
+  data.tar.gz: ebc6d36142bbcc380c039cd697197f466c4da36a
 SHA512:
-  metadata.gz: 64cc07ea988821934c647db33f361de9680b9c7819252f0c582ed28e56bbdcb909a2e7aaeee8756ba3e84db1d45165c2c2b55d882c49df374642c27523bce39a
-  data.tar.gz: 17ea0cc0a07ad04b155a90790521ece188c1b7cd438f4c7c8a398db4f004066a04f5c1c24af836a1f4a7220de54d9255ec2ee223cb68ede5d56819b2083fccf4
+  metadata.gz: b8f7c249400a6bedccd2f09e460a0e1e225be80b40c4e0b8266a70dec6d580a1d7f4e7affbbd99e3997a8626bcbe8716aa12fa2780772fd97acb2c149749f6ae
+  data.tar.gz: ce89e40c7dd939eb29c913a716053510f5ea8df38669b5c488d796bbeab9c6528396e7c39282fa133addb8de8fef95c3d2f20e4d7bd39a4d2aa5a054e5967522

data/lib/slapp/package.rb

@@ -17,11 +17,11 @@ class Slapp::Package
     @name_match[3]
   end
 
-  def package_name
+  def file_name
     @name_match[2]
   end
 
-  def file_name
+  def package_name
     @name_match[1]
   end
 
@@ -33,16 +33,16 @@ class Slapp::Package
     @name_match[5]
   end
 
+  def build
+    @name_match[6]
+  end
+
   def location
     @location_match[1]
   end
 
   def path
-    File.join "/slackware/slackware-#{@slackware_version}", location, file_name
-  end
-
-  def build
-    @name_match[5]
+    File.join "/slackware/slackware-#{@slackware_version}", location, package_name
   end
 
   def size_uncompressed
@@ -80,22 +80,9 @@ class Slapp::Package
   end
 
   def to_hash
-    {
-      file_name: file_name,
-      package_name: package_name,
-      name: name,
-      version: version,
-      arch: arch,
-      build: build,
-      size: {
-        compressed: size_compressed,
-        uncompressed: size_uncompressed
-      },
-      location: location,
-      path: path,
-      description: description,
-      original_description: original_description,
-      summary: summary
+    methods = [:name, :file_name, :package_name, :version, :arch, :build, :location, :path, :size_uncompressed, :size_compressed, :description, :original_description, :summary]
+    methods.each_with_object({}) { |m, hash|
+      hash[m] = self.send(m)
     }
   end
 

data/lib/slapp/parser.rb

@@ -23,8 +23,7 @@ class Slapp::Parser
 
   def packages
     raw_packages.map { |pkg|
-      package = Slapp::Package.new pkg.first, slackware_version
-      package.to_hash
+      Slapp::Package.new pkg.first, slackware_version
     }
   end
 

data/lib/slapp/version.rb

@@ -1,3 +1,3 @@
 module Slapp
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/parser_spec.rb

@@ -24,34 +24,47 @@ describe Slapp::Parser do
       @package = @parser.packages.first
     end
 
-    it "parses the filename" do
-      @package[:file_name].should == 'ConsoleKit-0.4.3-i486-1.txz'
+    it ".package_name" do
+      @package.package_name.should == 'ConsoleKit-0.4.3-i486-1.txz'
     end
 
-    it "parses the name" do
-      @package[:name].should == 'ConsoleKit'
+    it ".file_name" do
+      @package.file_name.should == 'ConsoleKit-0.4.3-i486-1'
     end
 
-    it "parses the version" do
-      @package[:version].should == '0.4.3'
+    it ".name" do
+      @package.name.should == 'ConsoleKit'
     end
 
-    it "parses the location" do
-      @package[:location].should == '/slackware/l'
+    it ".version" do
+      @package.version.should == '0.4.3'
     end
 
-    it "parses the path" do
-      @package[:path].should == '/slackware/slackware-13.37/slackware/l/ConsoleKit-0.4.3-i486-1.txz'
+    it ".location" do
+      @package.location.should == '/slackware/l'
     end
 
-    it "parses the size" do
-      @package[:size].should == {
-        :compressed => 131072,
-        :uncompressed => 624640
-      }
+    it ".arch" do
+      @package.arch.should == 'i486'
+    end
+
+    it ".build" do
+      @package.build.should == '1'
+    end
+
+    it ".path" do
+      @package.path.should == '/slackware/slackware-13.37/slackware/l/ConsoleKit-0.4.3-i486-1.txz'
+    end
+
+    it ".size_compressed" do
+      @package.size_compressed.should == 131072
     end
 
-    it "parses the description" do
+    it ".size_uncompressed" do
+      @package.size_uncompressed.should == 624640
+    end
+
+    it ".description" do
       desc = <<-desc
 ConsoleKit (user, login, and seat tracking framework)
 
@@ -60,10 +73,10 @@ ConsoleKit is a framework for defining and tracking users, login sessions, and s
 Homepage: http://freedesktop.org/wiki/Software/ConsoleKit
       desc
 
-      @package[:description].should == desc.strip
+      @package.description.should == desc.strip
     end
 
-    it "parses the original description" do
+    it ".original_description" do
       desc = <<-desc
 ConsoleKit (user, login, and seat tracking framework)
 
@@ -73,17 +86,35 @@ sessions, and seats.
 Homepage: http://freedesktop.org/wiki/Software/ConsoleKit
       desc
 
-      @package[:original_description].should == desc.strip
+      @package.original_description.should == desc.strip
     end
 
-    it "parses the summary" do
-      @package[:summary].should == "ConsoleKit (user, login, and seat tracking framework)"
+    it ".summary" do
+      @package.summary.should == "ConsoleKit (user, login, and seat tracking framework)"
+    end
+
+    it ".to_hash" do
+      @package.to_hash.should == {
+        :name=>"ConsoleKit",
+        :file_name=>"ConsoleKit-0.4.3-i486-1",
+        :package_name=>"ConsoleKit-0.4.3-i486-1.txz",
+        :version=>"0.4.3",
+        :arch=>"i486",
+        :build=>"1",
+        :location=>"/slackware/l",
+        :path=>"/slackware/slackware-13.37/slackware/l/ConsoleKit-0.4.3-i486-1.txz",
+        :size_uncompressed=>624640,
+        :size_compressed=>131072,
+        :description=>"ConsoleKit (user, login, and seat tracking framework)\n\nConsoleKit is a framework for defining and tracking users, login sessions, and seats.\n\nHomepage: http://freedesktop.org/wiki/Software/ConsoleKit",
+        :original_description=>"ConsoleKit (user, login, and seat tracking framework)\n\nConsoleKit is a framework for defining and tracking users, login\nsessions, and seats.\n\nHomepage: http://freedesktop.org/wiki/Software/ConsoleKit",
+        :summary=>"ConsoleKit (user, login, and seat tracking framework)"
+      }
     end
   end
 
   describe 'aalib' do
     before do
-      @aalib = @parser.packages.select { |pkg| pkg[:name] == 'aalib' }.first
+      @aalib = @parser.packages.select { |pkg| pkg.name == 'aalib' }.first
     end
 
     it "parses the original description" do
@@ -101,7 +132,7 @@ Jan Hubicka, Thomas A. K. Kjaer,
 Tim Newsome, and Kamil Toman.
       desc
 
-      @aalib[:original_description].should == original_desc.strip
+      @aalib.original_description.should == original_desc.strip
     end
 
     it 'parses the description' do
@@ -111,7 +142,7 @@ aalib (ASCII Art library)
 AA-lib is an ASCII art graphics library.  Internally, the AA-lib API is similar to other graphics libraries, but it renders the the output into ASCII art (like the example to the right :^) The developers of AA-lib are Jan Hubicka, Thomas A. K. Kjaer, Tim Newsome, and Kamil Toman.
       desc
 
-      @aalib[:description].should == desc.strip
+      @aalib.description.should == desc.strip
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slapp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Nic Aitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler