Skip to content

Commit

Permalink
Merge branch 'master' of github.com:JJ/hoborg
Browse files Browse the repository at this point in the history
  • Loading branch information
JJ committed Feb 20, 2019
2 parents af82447 + 17e3e97 commit e64efac
Show file tree
Hide file tree
Showing 5 changed files with 309 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*~

*.zip
*.log
*.aux
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Manuel the Marvelous Mechanical Man, the novel
[![Join the chat at https://gitter.im/JJ/hoborg](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/JJ/hoborg?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

This is the source for an ur-[dieselpunk](https://es.wikipedia.org/wiki/Dieselpunk) novel with a Spanish-created robot hobo in a balkanized
United States of America at the beginning of al alternative XXth century.
United States of America at the beginning of an alternative XXth century.

The novel is [available in Amazon.com for a dollar](https://www.amazon.com/dp/B00ED084BK/ref=as_li_ss_til?tag=perltutobyjjmere&camp=0&creative=0&linkCode=as4&creativeASIN=B00ED084BK&adid=1HG3N2ZNW9C40MFDC9WP&).

Expand All @@ -20,7 +20,7 @@ Plot outline

After the United States of America is defeated by a technologically superior Cuba and
Spain, Florida becomes an independent multiracial socialist state
which is inmediately at war with the (now diminished) America.
which is immediately at war with the (now diminished) America.

A North-American Pinkerton agent is sent there to recover a
*mechanical man* that has been seen in a circus doing gigs from
Expand Down Expand Up @@ -57,9 +57,9 @@ main language. Sending me corrections is not the only way you can help
Full disclosure
------------------

The novel is roughly completed (that is, it's got an ending, it will
actually never be finished since it might evolve in time) and
published it in Amazon.com and the rest of the Amazon shops. Since all
The novel is roughly completed (that is, while it's got an ending, it will
actually never be finished since it might evolve in time) and is
published in Amazon.com and the rest of the Amazon shops. Since all
your contributions will be here, in the repo, they are obviously
acknowledged, but I'll acknowledge it also in the prologue itself and,
if I earn enough to be able to physically print it and mail it, will
Expand All @@ -71,20 +71,20 @@ Start reading and participating

Just go to [the novel](text/text.md). You can also
[read about the characters](text/characters.md), although doing so
might result in spoilerage, or about the
might result in spoiling the story for yourself, or about the
[geography of the Republic of Florida](text/geography.md).

Thanks
------

Many thanks to those that have provided
Many thanks to those who have provided
[fixes and suggestions](https://github.com/JJ/hoborg/pulls?q=is%3Apr+is%3Aclosed)
to the text: [`yarikoptic`](https://github.com/yarikoptic) and [`quentessential`](http://github.com/quentessential).

How this can help you write your own novel
-----------------------

Read the [installation instructions](INSTALL.md) to get your very own novel going in Github. They are long-ish, but may be worth the while.
Read the [installation instructions](INSTALL.md) to get your very own novel going in Github. They are long-ish, but may be worth your while.

Navigating the repository
---------------------------------
Expand All @@ -102,5 +102,5 @@ Get in touch
---------------

If you have some issue related to the novel, [use the GitHub
issues](https://github.com/JJ/hoborg/issues), any other business, just
issues](https://github.com/JJ/hoborg/issues). For any other business, just
[email me](mailto:[email protected]).
2 changes: 1 addition & 1 deletion data/download-logs.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

for i in $(seq $1 $2)
for i in $(seq 1 $1)
do
travis logs $i > log-$i.log
done
28 changes: 28 additions & 0 deletions data/get-travis.pl
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/usr/bin/env perl

use strict;
use warnings;

use v5.20;

use JSON;
use Git;
use File::Slurp::Tiny qw(write_file);

my $status = `travis show`;

my ($num_builds) = ($status =~ /Build\s+\#(\d+)/s);

my %commits;
for my $i (1..$num_builds) {
my $this_status = `travis show $i`;
my ($state,$commit) = ($this_status =~ /State:\s+(\w+).+\.\.\.(\w+)/s);
if ( $state ne 'errored' ) {
$commits{$i} = $commit;
}
}

for my $c ( sort {$a <=> $b } %commits ) {
say "$c $commits{$c}";
}

Loading

0 comments on commit e64efac

Please sign in to comment.