ian 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de4bcf5f0a0b4142e5c0bf55307ab8775c07aca2
-  data.tar.gz: 1db02e646ad6b8a337bad3d4afd111ea9827705c
+  metadata.gz: f6532da46f52c70d5a917e8e9692e850301accee
+  data.tar.gz: c443a6e802103e07bb71fd94b1836cc78147ad3f
 SHA512:
-  metadata.gz: 79051668953ad9be1db7102d1b45c65f9842140ac90998d83698e6deab7081dbbfc156a51a4ca3f1fe1adeafe7066173b9dcbaada253133d87e31355e89f8db0
-  data.tar.gz: 0b4f52a7c647e86a530e73beaa3f611a8a319419b58c4b1b2533b980764a2a11d5028f52d90dd0dfa38278238a466778e99f318e6de451a28cd35a0b51c1924f
+  metadata.gz: f51e2f383da45c71eff99c4bfb3d517a985677f12d850162690e9b6228e8d0e118cdd076c95c2c83e454fbc21fa58c501935b08c78ce7d2f4cac484da02a3e06
+  data.tar.gz: 87fa0d84ec6a91aff53c5f6f2562c4cc25c12c7a31c7811058af8de729df6290b1ae37f246328fc3e1ce2e85117e3d03e146779447834dd054db93a783dc26ea

data/README.md

@@ -105,6 +105,17 @@ version (prepending it with a `v`) and then builds the package as above.
 This does the same as before, however first it will take the version number in
 the argument, write it to the control file and commit the control file.
 
+**Push a package**
+
+Push a package to remote repo by adding a file called `.ianpush` in the repo root
+containing a command to run to push the file up.  E.G:
+
+    package_cloud push my/repo/debian/jessie
+
+Then when you run `ian push` it will run that command and tack the package for
+the current version on the end, warning you if you didn't run `ian pkg` yet.  You
+can also give the package name as an argument like `ian push pkg/the-pkg_0.0.1_all.deb`.
+
 **Show versions**:
 
 Show the versions by using this command:
@@ -129,6 +140,7 @@ Need help with the control files?  Try these links:
 - [ ] allow packaging past versions from git tags
 - [ ] add option for semver enforcement
 - [ ] remove rsync dependency
+- [ ] add PUSH command to a server via rsync (lol)
 
 ## Development
 

data/bin/ian

@@ -64,6 +64,32 @@ Slop.parse help: true do
     end
   end
 
+  command :push do
+    description "Push the latest debian package up"
+
+    run do |opts, args|
+      check_initialized!
+      if !File.exist? ".ianpush"
+        puts "You need to specify a command to run in a file called .ianpush"
+        exit 1
+      end
+
+      cmd = File.read(File.join(IAN_DIR, ".ianpush")).chomp
+      c   = Ian.control(IAN_DIR)
+
+      if args.first
+        cmd += " "+args.first
+      else
+        fn = c.pkgname+".deb"
+        path = File.join(IAN_DIR, "pkg", fn)
+        abort "Package not yet built: #{fn}" unless File.exist?(path)
+        cmd += " "+ path
+      end
+
+      system cmd
+    end
+  end
+
   command :set do
     description "Modify the Debian control file"
 
@@ -110,7 +136,7 @@ Slop.parse help: true do
   command :deps do
     description "Print dependencies for this package"
 
-    run do |opts, args| 
+    run do |opts, args|
       check_initialized!
 
       ctrl = Ian.control(IAN_DIR)
@@ -140,18 +166,19 @@ Slop.parse help: true do
       check_initialized!
 
       ctrl = Ian.control(IAN_DIR)
+      ctrlpath = Ian.ctrlpath(IAN_DIR)
       version = ctrl[:version]
 
       if args.any?
         version = args.first
-        version.gsub!(/^v/, '')
+        version = version.gsub(/^v/, '')
         log.info "Releasing v#{version}"
         log.info "Updating control file"
         ctrl[:version] = version
-        ctrl.save
+        Ian::Control.save(ctrl, ctrlpath)
 
         log.info "Committing control file"
-        system "git add #{ctrl.path}"
+        system "git add #{ctrlpath}"
         system "git commit -m 'releasing v#{version}'"
 
       end

data/lib/ian.rb

@@ -52,7 +52,7 @@ module Ian
       #File.write("#{path}/ian.yml", cfg.to_yaml)
       #log.info "Generated ian.yml"
 
-      File.write("#{path}/.ianignore", "pkg\n")
+      File.write("#{path}/.ianignore", "pkg\n.ianpush\n")
       log.info "Generated .ianignore"
     end
 

data/lib/ian/control.rb

@@ -19,6 +19,16 @@ module Ian
       @fields[field]
     end
 
+    def pkgname
+      parts = [
+        @fields[:package],
+        @fields[:version],
+        @fields[:arch]
+      ]
+
+      "%s_%s_%s" % parts
+    end
+
     # deletes a field from the hash
     def delete(field)
       field.to_sym if field.is_a? String

data/lib/ian/packager.rb

@@ -77,13 +77,7 @@ module Ian
     private
 
     def pkgname
-      parts = [
-        @ctrl[:package],
-        @ctrl[:version],
-        @ctrl[:arch]
-      ]
-
-      "%s_%s_%s" % parts
+      @ctrl.pkgname
     end
 
     # generate the rsync command

data/lib/ian/utils.rb

@@ -3,7 +3,7 @@ module Ian
     extend self
 
     def determine_installed_size(path)
-      %x[du #{path} -ks --exclude=".git"].split.first
+      %x[du #{path} -ks --exclude=".git" --exclude="pkg"].split.first
     end
 
     # try to guess the maintainer by reading the git config file

data/lib/ian/version.rb

@@ -1,3 +1,3 @@
 module Ian
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ian
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Robert McLeod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop