You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@whimsical.apache.org by Craig L Russell <cr...@oracle.com> on 2015/11/20 02:40:10 UTC
No report was submitted --------------- received
I’ve cloned the whimsy-agenda from github and modified it. Now what? I guess I need to create a pull request which I’ve never done.
I do have a github account but have always pulled and pushed directly.
So now what?
Craig
[CraigRussell:~/apache/git/whimsy-agenda] clr% git diff
diff --git a/models/minutes.rb b/models/minutes.rb
index 0f610f9..c5cc57f 100755
--- a/models/minutes.rb
+++ b/models/minutes.rb
@@ -60,7 +60,7 @@ class Minutes
if notes and !notes.empty?
[section, title, report, "\n\n" + notes.reflow(7,62)]
elsif report.strip.empty?
- [section, title, report, "\n\n No report was submitted."]
+ [section, title, report, "\n\n No report was received."]
else
[section, title, report, ""]
end
@@ -138,7 +138,7 @@ class Minutes
missing = minutes.scan(/^Attachment (\w\w?):.*\s*\n---/).flatten
missing.each do |attach|
- minutes.sub! /^(\s+)See Attachment #{attach}$/, '\1No report was submitted.'
+ minutes.sub! /^(\s+)See Attachment #{attach}$/, '\1No report was received.'
end
minutes.sub! 'Minutes (in Subversion) are found under the URL:',
diff --git a/spec/secretary_spec.rb b/spec/secretary_spec.rb
index dc10ace..620ae49 100644
--- a/spec/secretary_spec.rb
+++ b/spec/secretary_spec.rb
@@ -81,7 +81,7 @@ feature 'report' do
expect(draft).to include('Published minutes can be found at')
expect(draft).to include('approved as submitted by General Consent.')
expect(draft).to include('@Sam: Is anyone on the PMC looking at the reminders?')
- expect(draft).to include('No report was submitted.')
+ expect(draft).to include('No report was received.')
expect(draft).to include('was approved by Unanimous Vote of the directors present.')
expect(draft).to match(/Adjourned at \d+:\d\d [ap]\.m\. \(Pacific\)/)
[CraigRussell:~/apache/git/whimsy-agenda] clr% git pull
Already up-to-date.
> On Nov 19, 2015, at 8:47 AM, Sam Ruby <ru...@intertwingly.net> wrote:
>
> On Thu, Nov 19, 2015 at 11:31 AM, Craig L Russell
> <cr...@oracle.com> wrote:
>> One of my favorites: no report was submitted.
>>
>> We actually don’t know if a report was submitted and lost in transit. Unlikely, but considering the state of communications, possible.
>>
>> More accurate is: no report was received.
>
> Sounds like an easy change. Being able to run the board agenda tool
> locally as a backup is something you want to explore anyway. Care to
> take a stab at it? I'll share a few pointers to make things easier.
>
> ---
>
> Code where this text is added to draft minutes:
>
> https://github.com/rubys/whimsy-agenda/blob/master/models/minutes.rb#L63
>
> Test for that code:
>
> https://github.com/rubys/whimsy-agenda/blob/master/spec/secretary_spec.rb#L84
>
> - - -
>
> The code for collating board minutes is here:
>
> https://svn.apache.org/repos/private/foundation/board/scripts/collate_minutes.rb
>
> Lines 623 and 626.
>
>> Craig
>
> - Sam Ruby
>
>>> On Nov 18, 2015, at 9:50 PM, Greg Stein <gs...@gmail.com> wrote:
>>>
>>>
>>> "No report was submitted" ... I think that isn't clear. Most PMCs don't
>>> submit reports each month. The real message is "A report was expected, but
>>> not submitted". *hand-wave* in nicer messaging.
>>>
>>
>> Craig L Russell
>> Architect, Oracle
>> http://db.apache.org/jdo
>> 408 276-5638 mailto:Craig.Russell@oracle.com
>> P.S. A good JDO? O, Gasp!
>>
Craig L Russell
Architect, Oracle
http://db.apache.org/jdo
408 276-5638 mailto:Craig.Russell@oracle.com
P.S. A good JDO? O, Gasp!
Re: No report was submitted --------------- received
Posted by Sam Ruby <ru...@intertwingly.net>.
On Thu, Nov 19, 2015 at 8:56 PM, Sam Ruby <ru...@intertwingly.net> wrote:
> git remote rename origin https://github.com/CraigLRussell/whimsy-agenda.git
Nope. Try:
git remote set-url origin https://github.com/CraigLRussell/whimsy-agenda.git
- Sam Ruby
Re: No report was submitted --------------- received
Posted by Sam Ruby <ru...@intertwingly.net>.
On Thu, Nov 19, 2015 at 8:40 PM, Craig L Russell
<cr...@oracle.com> wrote:
> I’ve cloned the whimsy-agenda from github and modified it. Now what? I guess I need to create a pull request which I’ve never done.
>
> I do have a github account but have always pulled and pushed directly.
>
> So now what?
Should you become a committer on Whimsy, you will be able to push
directly; meanwhile lets go through the steps for a contributor. I'll
take it slow (some of these steps won't be necessary the next time you
make a change):
The first step is to fork the repository on Github. Go to:
https://github.com/rubys/whimsy-agenda
.. and click on 'fork' in the top right.
Now you will have your own copy (with CraigLRussell instead of rubys).
Now you are going to want to change your clone on your (desk|lap)-top
so that it pushes to your fork. First verify where you are currently
pointing:
git remote -v
If you don't see your repository (which you won't, you just created it), do:
git remote rename origin https://github.com/CraigLRussell/whimsy-agenda.git
(you can also use the SSH style clone URL).
Verify the results using "git remote -v" again.
Now you are going to want to push your changes to your fork. Best
practices are to put each separate thing you are working on into a
separate branch. The command to do so is (bizarrely) git checkout:
git checkout -b report_received
Commit your changes:
git commit -a
And then push them:
git push origin report_received
Now if you visit https://github.com/CraigLRussell/whimsy-agenda, you
will see it tell you that you recently created a branch, and will see
a button to create a pull request. Go ahead and do that.
I'll get notified that there is a pull request ready for me to
process, and take it from there.
- Sam Ruby
> Craig
>
> [CraigRussell:~/apache/git/whimsy-agenda] clr% git diff
> diff --git a/models/minutes.rb b/models/minutes.rb
> index 0f610f9..c5cc57f 100755
> --- a/models/minutes.rb
> +++ b/models/minutes.rb
> @@ -60,7 +60,7 @@ class Minutes
> if notes and !notes.empty?
> [section, title, report, "\n\n" + notes.reflow(7,62)]
> elsif report.strip.empty?
> - [section, title, report, "\n\n No report was submitted."]
> + [section, title, report, "\n\n No report was received."]
> else
> [section, title, report, ""]
> end
> @@ -138,7 +138,7 @@ class Minutes
>
> missing = minutes.scan(/^Attachment (\w\w?):.*\s*\n---/).flatten
> missing.each do |attach|
> - minutes.sub! /^(\s+)See Attachment #{attach}$/, '\1No report was submitted.'
> + minutes.sub! /^(\s+)See Attachment #{attach}$/, '\1No report was received.'
> end
>
> minutes.sub! 'Minutes (in Subversion) are found under the URL:',
> diff --git a/spec/secretary_spec.rb b/spec/secretary_spec.rb
> index dc10ace..620ae49 100644
> --- a/spec/secretary_spec.rb
> +++ b/spec/secretary_spec.rb
> @@ -81,7 +81,7 @@ feature 'report' do
> expect(draft).to include('Published minutes can be found at')
> expect(draft).to include('approved as submitted by General Consent.')
> expect(draft).to include('@Sam: Is anyone on the PMC looking at the reminders?')
> - expect(draft).to include('No report was submitted.')
> + expect(draft).to include('No report was received.')
> expect(draft).to include('was approved by Unanimous Vote of the directors present.')
> expect(draft).to match(/Adjourned at \d+:\d\d [ap]\.m\. \(Pacific\)/)
>
> [CraigRussell:~/apache/git/whimsy-agenda] clr% git pull
> Already up-to-date.
>
>> On Nov 19, 2015, at 8:47 AM, Sam Ruby <ru...@intertwingly.net> wrote:
>>
>> On Thu, Nov 19, 2015 at 11:31 AM, Craig L Russell
>> <cr...@oracle.com> wrote:
>>> One of my favorites: no report was submitted.
>>>
>>> We actually don’t know if a report was submitted and lost in transit. Unlikely, but considering the state of communications, possible.
>>>
>>> More accurate is: no report was received.
>>
>> Sounds like an easy change. Being able to run the board agenda tool
>> locally as a backup is something you want to explore anyway. Care to
>> take a stab at it? I'll share a few pointers to make things easier.
>>
>> ---
>>
>> Code where this text is added to draft minutes:
>>
>> https://github.com/rubys/whimsy-agenda/blob/master/models/minutes.rb#L63
>>
>> Test for that code:
>>
>> https://github.com/rubys/whimsy-agenda/blob/master/spec/secretary_spec.rb#L84
>>
>> - - -
>>
>> The code for collating board minutes is here:
>>
>> https://svn.apache.org/repos/private/foundation/board/scripts/collate_minutes.rb
>>
>> Lines 623 and 626.
>>
>>> Craig
>>
>> - Sam Ruby
>>
>>>> On Nov 18, 2015, at 9:50 PM, Greg Stein <gs...@gmail.com> wrote:
>>>>
>>>>
>>>> "No report was submitted" ... I think that isn't clear. Most PMCs don't
>>>> submit reports each month. The real message is "A report was expected, but
>>>> not submitted". *hand-wave* in nicer messaging.
>>>>
>>>
>>> Craig L Russell
>>> Architect, Oracle
>>> http://db.apache.org/jdo
>>> 408 276-5638 mailto:Craig.Russell@oracle.com
>>> P.S. A good JDO? O, Gasp!
>>>
>
> Craig L Russell
> Architect, Oracle
> http://db.apache.org/jdo
> 408 276-5638 mailto:Craig.Russell@oracle.com
> P.S. A good JDO? O, Gasp!
>