lib/slapp/package.rb in slapp-0.1.3 vs lib/slapp/package.rb in slapp-0.2.0
- old
+ new
@@ -15,15 +15,15 @@
def name
@name_match[3]
end
- def package_name
+ def file_name
@name_match[2]
end
- def file_name
+ def package_name
@name_match[1]
end
def version
@name_match[4]
@@ -31,22 +31,22 @@
def arch
@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
+ File.join "/slackware/slackware-#{@slackware_version}", location, package_name
end
- def build
- @name_match[5]
- end
-
def size_uncompressed
convert_to_bytes @size_match.flatten.last
end
def size_compressed
@@ -78,25 +78,12 @@
.slice(/^(.+)\n/)
.strip
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
private