slapp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12cf240678eef71d4941741699f6973aadfc43c7
-  data.tar.gz: 354ffe9f9def0a4da24a0e7c513e24f37e894cf8
+  metadata.gz: 0ce9903469327aab318ff50b88cc417d94b4836c
+  data.tar.gz: 94b5b1081d35d9efe684984ba14b3b632cc95b83
 SHA512:
-  metadata.gz: 4dbd3f742daa4a9fcd51ce6dfcddce07847452e63cd9250cca9bae562f344b0e842c7d03062a76c3d538781be926e87b42561ba5beef597553652bbf1eaf15ae
-  data.tar.gz: 5195f1300388305540517eab43cfe39544c205d1b82699bcd47f05e62746a2c34dec09a1c93e544ce00805de2cdc1933bbe7bb5aec82479cb9cd9b4ea43f1a1c
+  metadata.gz: 64cc07ea988821934c647db33f361de9680b9c7819252f0c582ed28e56bbdcb909a2e7aaeee8756ba3e84db1d45165c2c2b55d882c49df374642c27523bce39a
+  data.tar.gz: 17ea0cc0a07ad04b155a90790521ece188c1b7cd438f4c7c8a398db4f004066a04f5c1c24af836a1f4a7220de54d9255ec2ee223cb68ede5d56819b2083fccf4

data/lib/slapp/package.rb

@@ -3,8 +3,9 @@ class Slapp::Package
 
   attr_accessor :data
 
-  def initialize(data)
+  def initialize(data, slackware_version)
     @data = data
+    @slackware_version = slackware_version
 
     @name_match = regex('name').match(data)
     @location_match = regex('location').match(data)
@@ -13,19 +14,23 @@ class Slapp::Package
   end
 
   def name
+    @name_match[3]
+  end
+
+  def package_name
     @name_match[2]
   end
 
-  def filename
+  def file_name
     @name_match[1]
   end
 
   def version
-    @name_match[3]
+    @name_match[4]
   end
 
   def arch
-    @name_match[4]
+    @name_match[5]
   end
 
   def location
@@ -33,7 +38,7 @@ class Slapp::Package
   end
 
   def path
-    File.join location, filename
+    File.join "/slackware/slackware-#{@slackware_version}", location, file_name
   end
 
   def build
@@ -76,7 +81,8 @@ class Slapp::Package
 
   def to_hash
     {
-      filename: filename,
+      file_name: file_name,
+      package_name: package_name,
       name: name,
       version: version,
       arch: arch,
@@ -105,7 +111,7 @@ private
 
   def regexes
     {
-      name: /PACKAGE NAME:\s+((.+)-(.+)-(.+)-(.+)\.t\wz)/,
+      name: /PACKAGE NAME:\s+(((.+)-(.+)-(.+)-(.+))\.t\wz)/,
       location: /PACKAGE LOCATION:\s+\.([\S]+)/,
       size: /PACKAGE SIZE\s+\(\w+\):\s+(.+)/,
       description: /PACKAGE DESCRIPTION:\s+(.+)/m

data/lib/slapp/parser.rb

@@ -1,11 +1,12 @@
 class Slapp::Parser
   include Slapp::Helpers
 
-  attr_accessor :lines, :contents
+  attr_accessor :lines, :contents, :slackware_version
 
-  def initialize(path)
+  def initialize(path, slackware_version)
     @lines = File.readlines(path, :encoding => 'ISO-8859-1')
     @contents = @lines.join('')
+    @slackware_version = slackware_version
   end
 
   def total_size_uncompressed
@@ -22,7 +23,7 @@ class Slapp::Parser
 
   def packages
     raw_packages.map { |pkg|
-      package = Slapp::Package.new pkg.first
+      package = Slapp::Package.new pkg.first, slackware_version
       package.to_hash
     }
   end

data/lib/slapp/version.rb

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

data/spec/parser_spec.rb

@@ -2,7 +2,7 @@ require 'slapp/parser'
 
 describe Slapp::Parser do
   before do
-    @parser = Slapp::Parser.new('spec/support/13.37/slackware/PACKAGES.TXT')
+    @parser = Slapp::Parser.new('spec/support/13.37/slackware/PACKAGES.TXT', '13.37')
   end
 
   it "parses the total size (uncompressed)" do
@@ -25,7 +25,7 @@ describe Slapp::Parser do
     end
 
     it "parses the filename" do
-      @package[:filename].should == 'ConsoleKit-0.4.3-i486-1.txz'
+      @package[:file_name].should == 'ConsoleKit-0.4.3-i486-1.txz'
     end
 
     it "parses the name" do
@@ -41,7 +41,7 @@ describe Slapp::Parser do
     end
 
     it "parses the path" do
-      @package[:path].should == '/slackware/l/ConsoleKit-0.4.3-i486-1.txz'
+      @package[:path].should == '/slackware/slackware-13.37/slackware/l/ConsoleKit-0.4.3-i486-1.txz'
     end
 
     it "parses the size" do

metadata

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